Kjq/longtoken support (after user-api and platform-client changes)