Merge branch 'hotfix/fix_migration_error'
Fixed font compilation issue
Merge branch 'hotfix/fix_font_issues' into develop