Fix missed renaming

Left a stray sort_properties reference behind
Merge branch 'tiered-sort' into staging2