Merge "Misc string updates" into pi-dev