[ros-diffs] [sserapion] 44373: Sync to trunk (r44371)