Change font in survey mode login
Fix conflicts after merging MH-789 to dev