[ros-diffs] [tkreuzer] 48196: Sync trunk HEAD (r48193)