Remove references to fonts
Merge pull request #8341 from Quy/3.0.0-wip

Remove references to fonts