diff --git a/.gitmodules b/.gitmodules
index 2849b4b..9e4b5b2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,3 @@
 [submodule "odpi"]
 	path = odpi
 	url = https://github.com/oracle/odpi.git
-    branch = v2.x
diff --git a/doc/src/conf.py b/doc/src/conf.py
index ff60f99..5ac4a41 100644
--- a/doc/src/conf.py
+++ b/doc/src/conf.py
@@ -40,9 +40,9 @@ author = 'Oracle'
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '6.4'
+version = '7.0'
 # The full version, including alpha/beta/rc tags.
-release = '6.4.1'
+release = '7.0.0-dev'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
diff --git a/odpi b/odpi
index d72c39d..ccdf1ff 160000
--- a/odpi
+++ b/odpi
@@ -1 +1 @@
-Subproject commit d72c39db60914841a2f11ca0721f39e6d2bbf378
+Subproject commit ccdf1ff0184ed1124ea3b0d2049db072df5130a3
diff --git a/setup.py b/setup.py
index c7b3a9f..6cc9c56 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ except:
     from distutils.extension import Extension
 
 # define build constants
-BUILD_VERSION = "6.4.1"
+BUILD_VERSION = "7.0.0-dev"
 
 # setup extra link and compile args
 extraLinkArgs = []