Merge pull request #1845 from shackbarth/filter-ext