Merge remote-tracking branch 'origin/oc_framework_cleanup_and_documentation' into oc_framework_cleanup_and_documentation