moved filtering to pipeline
Merge branch 'java'