Merge pull request #10979 from wtgodbe/R2RWindows