Update method signature of TokenConverter:convert. See Issue #2330929