Merge "Fix reference table sorting"