[ros-diffs] [janderwald] 50780: - Fix batt msvc build