Fixing font issues on windows
Merge branch 'test' into dev