[ros-diffs] [akhaldi] 46463: Sync with trunk head (part 3 of 3)