[ros-diffs] [cwittich] 41695: fix build