Merge "TokenManager: use secure tokens" into oc-dev