[ros-diffs] [tkreuzer] 46806: Sync to trunk head (r46805)