Merge Trond, this is the preliminary support for Windows.