Major update.

We are planning to throw this out when we do the major update to ding2tal codebase.
Merge branch 'oc_export' into merge