Merge "adding note about new API method for retrieving tokens - see Change I58bc5847"