Start adding code for ActiveX exposure.
Add auto-gen changes