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