Merge "String conversion bug fix" into v1.1