UPC-21 Restore sort on SQ version