Fix failing app_manager tests
Merge branch 'tiered-sort' into staging2