Merge branch 'hotfix/markdown' into develop