Merge "Extend the translation limit to 60" into oc-dev