Merge "[DO NOT MERGE] Fix winscope on R"