Merge "Require credential authentication when deleting a user" into main