Merge "fix msvc build" into experimental