Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'