Merge "Add and update string" into pi-dev