Merge "Fix mingw build error" into experimental