Merge "Remove USE_PQSORT and CHANGE_MV_SEARCH_ORDER"