[ros-diffs] [akhaldi] 47721: Sync uo to HEAD (r47720).