[ros-diffs] [tkreuzer] 47818: Sync to trunk (r47817)