Merge "Avoid calling oldFileFromRowFactory field directly"