[ros-diffs] [mc] 22625: See above