Merge pull request #22537 from jensschuppe/fix/typeErrorCustomFieldTokens