AUI-997 Prevent duplicated connectors