Merge branch 'master' into add-ws-test-page
changes done to make WS work
Merge branch 'add-ws-test-page'