[ros-diffs] [tkreuzer] 37088: sync to trunk head (37079)