Merge "Revert "Refactor ApfFilter constructor"" into main