Squashed 'core/' changes from 8b515b0..f4b1717

f4b1717 Cont'd websocket user interaction listener

git-subtree-dir: core
git-subtree-split: f4b1717ddb94ac332099997c583063ecda449553
Merge commit '4b7cd377b1f0b6b0720889e943604066160fc75c' into feature/issue297-wizard
Cont'd WebSocketUserInteractionListener