Merge "Split test for clearer ApfV4/V6 generator failure reporting" into main