[ros-diffs] [hpoussin] 23123: Merge 22156 to branch.