fixed issue with not moving next server 1 ws setup
Merge branch 'master' into sangraama-static-server-clone