Fixed classname
Merge branch 'field_tokens-performance' into np8