Includes patch from !14 (closed) for introspection option as well, since it's needed by the vapi option.