Merge pull request #4995 from lambdageek/dev-monodis-show-field-tokens