Merge pull request #4276 from henricm/winaot