[ros-diffs] [tkreuzer] 47833: Sync to trunk (r47832)