Merge pull request #2753 from xmcclure/checked-build-updates