[ros-diffs] [janderwald] 39159: -fix build