[ros-diffs] [tkreuzer] 48660: Sync with trunk head (r48654)