Merge "Update string description and char limits" into oc-dev