Merge remote-tracking branch 'remotes/stsquad/tags/pull-code-coverage-and-build-tweak...