Merge branch 'win_dev' into rjs-windows
(cherry picked from commit e5bfed038d090f78fed20934e4181a6cac2c9a2f)