Sync the Windows support
6 files changed