[ros-diffs] [mbosma] 21921: update by Alex Ionescu