Merge "Fix underlay DG delete testing issue"