Merge branch 'feature/markdown-enable-tags' into 'develop'