Merge "Update ApfV6Generator to support ADD and AND opcodes in v6+" into main