[ros-diffs] [tkreuzer] 36926: sync to trunk head (36925)