#2647: JS cross domain client is failing to connect
Merge branch 'release' into dev