Merge branch 'develop' into feature/alt-markdown-editor