MC-52: Move code from ConnectorMappingBundle

One line comment pls