Merge "Fixes injection of some repository-specific test classes" into main