Transferring changes in get_user() to feature (orig in stable)