[ros-diffs] [turner] 20073: merge 20049