[ros-diffs] [akhaldi] 47094: Sync with trunk head (part 1 of 2)