Merge branch 'code-coverage' into 'master'