[3570945] Update the rows schema to support both formats