Merged csv conversion code into v1.60 branch