Merge "Simplify ApfFilter using addCountAndPass/Drop methods" into main