Manually merged win32 toxic support with upstream