Merge "Update ApfIntegrationTest to use new ApfV4Generator constructor" into main