Merge "Update string" into sc-dev