[ros-diffs] [turner] 20076: merge 20048