[ros-diffs] [tkreuzer] 40760: Merge from trunk what got lost