fixing
Merge branch 'fix/font' into develop