Merge "Add InspectionCompanionProvider"