Merge branch 'hotfix/alt-font'
Cleanup schema items
Merge branch 'hotfix/schema' into develop