[ros-diffs] [spetreolle] 25781: move from branch