Merge "Revert^2 "Refactor ApfFilter constructor"" into main