[ros-diffs] [ion] 15611: Merge 15540:15610