Reorganized with CodeMaid.
Implemented https://trello.com/c/OYIdlDgu
Merge branch 'master' into topic-data-incrementalupdate