Merge "Update underlay DG for integration issues"