Windows

Partial merge.