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