Transferring get_user() changes from stable