made mapFieldToToken public, so it can be used in custom implementation
Merge remote-tracking branch 'origin/release-2.9.x' into release-2.9.x