Merge "Update overlay DG for delete flow"