Merge "Shutdown ApfFilter properly in ApfTest" into main