[ros-diffs] [turner] 20266: merge 20263 from GL's request.