More notes.
Merge branch 'develop' into feature/websockets