Repeating code in Font
Merge branch 'master' into reference_support