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