Merge "Fix mismatched delete/new couple"