Merge "Add assertion after domain deletion"