Merge "Introduce initial FontsContractTest" into oc-dev