Commit prior to refactoring ooicore/driver and its base driver