[ros-diffs] [tkreuzer] 43422: Sync to trunk HEAD (r43416)