Merge "Refactor ApfFilter creation"