Merge "Make Injector implementations more readable" into main