[ros-diffs] [gedmurphy] 51820: Merge r51819