Merge "Added token_ttl parameter"