Merge "Increase string character limits to 40" into pi-dev