Merge "Add modify string to resources." into oc-mr1-dev