[ros-diffs] [akhaldi] 71256: [0.4.1] Merge the UniATA sync in revisions 71252 and 71255. CORE-11157