Merge "Call ignore_user_abort() right before committing to the DB"