Update from upstream with token fix