[ros-diffs] [tkreuzer] 40611: Sync to trunk r40610