[ros-diffs] [janderwald] 50287: [CRT] - Fix build