Merge "Pass weight/italic pair instead of style." into oc-dev