diff --git a/build.gradle b/build.gradle
index b85ae24b25..e44b767e45 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,7 +40,7 @@ repositories {
 }
 
 ext {
-    opendistroVersion = '1.6.0'
+    opendistroVersion = '1.7.0'
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
 }
 
diff --git a/gradle.properties b/gradle.properties
index f40437edef..4b54b908e9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,4 +13,4 @@
 #   permissions and limitations under the License.
 #
 
-version=1.6.1
+version=1.7.0
diff --git a/opendistro-elasticsearch-sql.release-notes.md b/opendistro-elasticsearch-sql.release-notes.md
index fcfb8ccd8f..5818050e99 100644
--- a/opendistro-elasticsearch-sql.release-notes.md
+++ b/opendistro-elasticsearch-sql.release-notes.md
@@ -1,4 +1,4 @@
-## 2020-04-29 Version 1.6.1.0 (Current)
+## 2020-05-04 Version 1.7.0.0 (Current)
 
 #### Breaking Changes
 * Change [#414](https://github.com/opendistro-for-elasticsearch/sql/pull/414): Invalidate HTTP GET method.
@@ -10,10 +10,12 @@
 #### Documentation
 * Feature [#417](https://github.com/opendistro-for-elasticsearch/sql/pull/417): More docs in reference manual and add architecture doc. (issue: [#380](https://github.com/opendistro-for-elasticsearch/sql/issues/380)) 
 #### Security
+* Change [#456](https://github.com/opendistro-for-elasticsearch/sql/pull/456): Escape comma for CSV header and all queries. (issue: [#455](https://github.com/opendistro-for-elasticsearch/sql/issues/455))
 * Change [#447](https://github.com/opendistro-for-elasticsearch/sql/pull/447): Fix CSV injection issue. (issue: [#449](https://github.com/opendistro-for-elasticsearch/sql/issues/449))
 * Change [#419](https://github.com/opendistro-for-elasticsearch/sql/pull/419): Anonymize sensitive data in queries exposed to RestSqlAction logs. (issue: [#97](https://github.com/opendistro-for-elasticsearch/sql/issues/97))
 
 ### Bugfixes
+* Bugfix [#452](https://github.com/opendistro-for-elasticsearch/sql/pull/452): Support using aggregation function in order by clause. (issue: [#277](https://github.com/opendistro-for-elasticsearch/sql/issues/277))
 * Bugfix [#442](https://github.com/opendistro-for-elasticsearch/sql/pull/442): Count(distinct field) should translate to cardinality aggregation. (issue: [#439](https://github.com/opendistro-for-elasticsearch/sql/issues/439))
 * Bugfix [#437](https://github.com/opendistro-for-elasticsearch/sql/pull/437): Enforce AVG return double data type. (issue: [#408](https://github.com/opendistro-for-elasticsearch/sql/issues/408))
 * Bugfix [#425](https://github.com/opendistro-for-elasticsearch/sql/pull/425): Ignore the term query rewrite if there is no index found. (issue: [#355](https://github.com/opendistro-for-elasticsearch/sql/issues/355))