[ros-diffs] [tkreuzer] 37904: merge trunk head (37902)