[ros-diffs] [cfinck] 68252: Addendum to r68248