[ros-diffs] [mjansen] 72333: Addendum to r72332