[ros-diffs] [tkreuzer] 46468: Merge trunk head (46467)