Dont start timeline or websocket from UI
Merge branch 'master' into builds
7.639