Merge branch 'hotfix/coverage-status'
Merge branch 'master' into develop