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