Merge "Fix Unicode string handling" into pi-dev