AUI-997 Prevent duplicated connectors
AUI-997 Source formatting