[ros-diffs] [mbosma] 23300: Merge 23213