Merge "Cred delete fixes"