Fixed js conflict with connectors
Merge branch 'hotfix-7.1.5' into develop
Merge remote-tracking branch 'origin/develop' into develop