Merge "Add batching support to fixUserRegistration.php"