[ros-diffs] [tkreuzer] 46451: - Reduce diff to trunk