[ros-diffs] [jgardou] 70648: [BRANCHES/TRANSITION_PTE] - Sync to trunk head 70646