[BLOG-48]
[BLOG-49]
Merge branch 'master' into develop
Merge branch 'develop'