Merge "Change string" into pi-dev