Merge "Remove obsolete solution for support ApfV6 opcode." into main