merge [85438] from trunk to release, fix quickbook build on msvc