Merge pull request #2778 from xmcclure/checked-build-updates-2