Add support for filter.
Merge dev