[ros-diffs] [akhaldi] 52294: [KERNEL32] * Merge 49379 from the cmake branch. Fixes msvc build.