Almost there! CMake is broken due to windows adding .exe :'(
Merge remote-tracking branch 'origin/release-2.0-nightly' into release-2.0-nightly