Add sample filter
Merge branch 'sample_filter'