Merge "Fix ReorderAlgorithmUnitTest not restoring numRows properly" into udc-qpr-dev