[ros-diffs] [tkreuzer] 57061: Sync trunk r57060