Merge "Token Manager: use arbitrarily sized tokens." into oc-dev