unit test fix for meta=>sort
Merge branch 'develop' into pivot
rerun make