[ros-diffs] [tkreuzer] 35954: sync to trunk head (35945)