Merge branch 'feature/article-support' into 'develop'