Merge "Split FilterConfiguration and move to filter package"