Merge "Remove RuntimeGeneratedMappingService from config-manager"