Merge "fix null terminated string parsing" into pi-dev