Merge "ApfFilter unit test" into nyc-dev