[ros-diffs] [tkreuzer] 40742: reduce difference to trunk