[ros-diffs] [janderwald] 23589: merge 23524 from trunk