[ros-diffs] [tkreuzer] 46633: Merge to trunk head (r46631)