Override WebSocket URL for local testing
Merge branch 'master' into builds
7.151