Resolved merge conflict in cherry-picking from artesis
Tried to optimize the _ding_user_update_old_accounts() function