[ros-diffs] [gedmurphy] 20109: merge 20108 to branch