Merge "[MS21] Remove DataUnit dependency"