[ros-diffs] [tkreuzer] 40543: Sync trunk r40500