Merge "Fix underlay DG testing issues"