[ros-diffs] [akhaldi] 46148: Sync with trunk head