Merge "Refactor ApfV{4,6}Generator constructors for consistency" into main