Merge branch 'master' into develop
coverage increased
Merge branch 'develop'