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