Filter Fixes
Merge branch 'v6'