Merge "Fix double bolding" into oc-dev