Merge "Replace fonts of unknown origin" into oc-dev