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