Cherry pick win32re updates