Merge pull request #11187 from wtgodbe/NonWindowsR2R