Merge branch 'jk/list-objects-filter-cleanup'