[ros-diffs] [tkreuzer] 40093: Sync to trunk head (r40091)