[ros-diffs] [turner] 20074: merge 20053