Merge "Fix Batch Cred Deletes"