Merge "InspectionCompanions as nested classes"