Merge branch 'ls/convert-filter-progress'