Merge "Fix issue where characters overlap" into oc-dr1-dev