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