Merge "Add InspectionHelper and related interfaces"