Merge pull request #2916 from erozenfeld/Checkedx86BuildFix