Merge "Fix underlay DG testing issue"