[ros-diffs] [sserapion] 44790: Sync to trunk (r44789)