[ros-diffs] [tkreuzer] 47746: Sync to trunk head (r47736)