Merge branch 'master' into develop
Fixed issues with no drafts.
Merge branch 'develop'