Merge "Fix data format for size panels"