you can merge the encoding fix now.