Filter works
Merge commit '74992cca523a7e26a87ea9a7fa33cb5be1749cd0'