add device websocket call
Merge branch 'master' into staging