Merge "Add initial DG changes for underlay"