diff --git a/Dockerfile b/Dockerfile
index 739f9c9f6..2b09592f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:stable-slim
 
-ENV OMNIDB_VERSION=2.16.0
+ENV OMNIDB_VERSION=2.17.0
 ENV SERVICE_USER=omnidb
 
 WORKDIR /${SERVICE_USER}
diff --git a/OmniDB/OmniDB/custom_settings.py b/OmniDB/OmniDB/custom_settings.py
index 333ff7d79..166c666c2 100644
--- a/OmniDB/OmniDB/custom_settings.py
+++ b/OmniDB/OmniDB/custom_settings.py
@@ -1,7 +1,7 @@
 import os
 
-OMNIDB_VERSION = 'OmniDB 2.16.0'
-OMNIDB_SHORT_VERSION = '2.16.0'
+OMNIDB_VERSION = 'OmniDB 2.17.0'
+OMNIDB_SHORT_VERSION = '2.17.0'
 OMNIDB_ADDRESS = '127.0.0.1'
 OMNIDB_WEBSOCKET_PORT = 25482
 DEV_MODE = True
diff --git a/OmniDB/OmniDB/migrations/omnidb_0.0.0_2.16.0.sql b/OmniDB/OmniDB/migrations/omnidb_0.0.0_2.17.0.sql
similarity index 99%
rename from OmniDB/OmniDB/migrations/omnidb_0.0.0_2.16.0.sql
rename to OmniDB/OmniDB/migrations/omnidb_0.0.0_2.17.0.sql
index e7ffc8066..740110d26 100644
--- a/OmniDB/OmniDB/migrations/omnidb_0.0.0_2.16.0.sql
+++ b/OmniDB/OmniDB/migrations/omnidb_0.0.0_2.17.0.sql
@@ -631,4 +631,4 @@ CREATE TABLE version (
     ver_id text not null,
     constraint pk_versions primary key (ver_id)
 );--omnidb--
-INSERT INTO version VALUES('2.16.0');--omnidb--
+INSERT INTO version VALUES('2.17.0');--omnidb--
diff --git a/OmniDB/OmniDB/migrations/omnidb_2.16.0_2.17.0.sql b/OmniDB/OmniDB/migrations/omnidb_2.16.0_2.17.0.sql
new file mode 100644
index 000000000..25e328624
--- /dev/null
+++ b/OmniDB/OmniDB/migrations/omnidb_2.16.0_2.17.0.sql
@@ -0,0 +1 @@
+UPDATE version SET ver_id = '2.17.0';--omnidb--
\ No newline at end of file
diff --git a/OmniDB/OmniDB/user_database.py b/OmniDB/OmniDB/user_database.py
index cb694914a..7d6c3903e 100644
--- a/OmniDB/OmniDB/user_database.py
+++ b/OmniDB/OmniDB/user_database.py
@@ -7,7 +7,7 @@
 import OmniDB_app.include.OmniDatabase as OmniDatabase
 
 migrations = {
-    '0.0.0': ('2.16.0', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_0.0.0_2.16.0.sql')),
+    '0.0.0': ('2.17.0', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_0.0.0_2.17.0.sql')),
     '2.4.0': ('2.4.1', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_2.4.0_2.4.1.sql')),
     '2.4.1': ('2.5.0', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_2.4.1_2.5.0.sql')),
     '2.5.0': ('2.6.0', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_2.5.0_2.6.0.sql')),
@@ -23,6 +23,7 @@
     '2.14.1': ('2.14.2', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_2.14.1_2.14.2.sql')),
     '2.14.2': ('2.15.0', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_2.14.2_2.15.0.sql')),
     '2.15.0': ('2.16.0', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_2.15.0_2.16.0.sql')),
+    '2.16.0': ('2.17.0', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_2.16.0_2.17.0.sql')),
 }
 
 def get_current_version(p_database):
diff --git a/OmniDB/OmniDB_app/static/OmniDB_app/js/Workspace.js b/OmniDB/OmniDB_app/static/OmniDB_app/js/Workspace.js
index 70c861604..20f315391 100644
--- a/OmniDB/OmniDB_app/static/OmniDB_app/js/Workspace.js
+++ b/OmniDB/OmniDB_app/static/OmniDB_app/js/Workspace.js
@@ -54,27 +54,12 @@ $(function () {
 	    <div class="welcome_release_container">
 	      <ul class="welcome_release_list">
 
-					<li class="welcome_release_item"><span>Monitoring Dashboard: Graph monitor unit type</span></li>
-					<li class="welcome_release_item"><span>Monitoring Dashboard: New standard units: TPS, WAL Production and Replication Graph</span></li>
-					<li class="welcome_release_item"><span>PostgreSQL TreeView: New groups for partitioned and inherited tables</span></li>
-					<li class="welcome_release_item"><span>PostgreSQL Debugger Plugin: Support for PostgreSQL running on OSX</span></li>
-					<li class="welcome_release_item"><span>Server: Support to run OmniDB on a custom URL path</span></li>
-					<li class="welcome_release_item"><span>Snippets: Run Snippet in Connection</span></li>
-					<li class="welcome_release_item"><span>Add Connection list in (+) menu of outer tabs</span></li>
-					<li class="welcome_release_item"><span>Show red X on tabs only on mouse hover</span></li>
-					<li class="welcome_release_item"><span>Color icons in Dark Theme</span></li>
-					<li class="welcome_release_item"><span>Release Notes outer tab now stay closed and only open upon next upgrade</span></li>
-					<li class="welcome_release_item"><span>Included procedures in Advanced Object Search for PostgreSQL 11</span></li>
-					<li class="welcome_release_item"><span>OmniDB server and PostgreSQL debugger plugin packages under Debian PGDG repository (thanks to Christoph Berg @df7cb )</span></li>
-					<li class="welcome_release_item"><span>Fixed #768: Monitoring - some units fail on a standby server</span></li>
-					<li class="welcome_release_item"><span>Fixed #836: SELECT ... INTO is not allowed here</span></li>
-					<li class="welcome_release_item"><span>Fixed #845: Partitioned relation indexes</span></li>
-					<li class="welcome_release_item"><span>Fixed #938: Password in connection string not used</span></li>
-					<li class="welcome_release_item"><span>Fixed #940: Unable to change column width of query results</span></li>
-					<li class="welcome_release_item"><span>Fixed #960: Snippet TreeView not rendering properly</span></li>
-					<li class="welcome_release_item"><span>Fixed #970: Focus on change Query Tab names</span></li>
-					<li class="welcome_release_item"><span>Fixed #981: Updatable chart titles</span></li>
-					<li class="welcome_release_item"><span>Fixed #990: Cleanup of inactive web socket clients</span></li>
+					<li class="welcome_release_item"><span>Support to PostgreSQL 12.</span></li>
+					<li class="welcome_release_item"><span>Table DDL panel shows generated columns.</span></li>
+					<li class="welcome_release_item"><span>Added SQL template for Cluster Index, accessible from context menu in TreeView.</span></li>
+					<li class="welcome_release_item"><span>Added Advanced Object Search as an option in Inner Tab context menu.</span></li>
+					<li class="welcome_release_item"><span>Server ping causing peaks of false positives in moments of brief network interruption or idle activities, or when the notebook running OmniDB was put to sleep.</span></li>
+					<li class="welcome_release_item"><span>Render issue with graph chart type.</span></li>
 
 	      </ul>
 	    </div>
diff --git a/OmniDB/OmniDB_app/templates/OmniDB_app/base.html b/OmniDB/OmniDB_app/templates/OmniDB_app/base.html
index 2e5f6d4be..993dc277b 100644
--- a/OmniDB/OmniDB_app/templates/OmniDB_app/base.html
+++ b/OmniDB/OmniDB_app/templates/OmniDB_app/base.html
@@ -5,14 +5,14 @@
   </style>
   <link rel="shortcut icon" type="image/x-icon" href="{{url_folder}}/static/OmniDB_app/images/favicon.ico"/>
 
-	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/style.css?v2.16.0.1"            />
+	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/style.css?v2.17.0.0"            />
 
-  <link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/modern-style.css?v2.16.0.1"            />
+  <link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/modern-style.css?v2.17.0.0"            />
 
-	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/handsontable.full.css?v2.16.0.1"/>
-	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/msdropdown/dd.css?v2.16.0.1"    />
-  <link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/lib/tabs/css/tabs.css?v2.16.0.1"    />
-  <link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/popper.css?v2.16.0.1"  />
+	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/handsontable.full.css?v2.17.0.0"/>
+	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/msdropdown/dd.css?v2.17.0.0"    />
+  <link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/lib/tabs/css/tabs.css?v2.17.0.0"    />
+  <link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/popper.css?v2.17.0.0"  />
 
   <link rel="stylesheet" href="{{url_folder}}/static/OmniDB_app/css/explain/bootstrap.css">
   <link rel="stylesheet" href="{{url_folder}}/static/OmniDB_app/css/explain/main.css">
@@ -594,32 +594,32 @@ <h2>Primary Supporter:</h2>
   </div>
 
   <div class="div_loading"><button id="bt_cancel_ajax" onclick="cancelAjax()">Cancel</button></div>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/jquery-1.11.2.min.js?v2.16.0.1"      ></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/AjaxControl.js?v2.16.0.1"            ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/jquery-1.11.2.min.js?v2.17.0.0"      ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/AjaxControl.js?v2.17.0.0"            ></script>
   <script type="text/javascript">
   startLoading()
   </script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/explain/react.js?v2.16.0.1"          ></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/explain/react-dom.js?v2.16.0.1"      ></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/explain/d3.js?v2.16.0.1"             ></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/explain/pgplan.js?v2.16.0.1"         ></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/popper.min.js?v2.16.0.1"             ></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/tooltip.min.js?v2.16.0.1"            ></script>
-	<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/jquery.dd.min.js?v2.16.0.1"          ></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/xterm.js?v2.16.0.1"                  ></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/fit.js?v2.16.0.1"                    ></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/ace/ace.js?v2.16.0.1"               ></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/ace/mode-sql.js?v2.16.0.1"          ></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/ace/ext-language_tools.js?v2.16.0.1"></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/tabs/lib/tabs.js?v2.16.0.1"         ></script>
-	<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/handsontable.full.js?v2.16.0.1"      ></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/NotificationControl.js?v2.16.0.1"    ></script>
-
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/WebSocketControl.js?v2.16.0.1"       ></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Renderers.js?v2.16.0.1"              ></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/HeaderActions.js?v2.16.0.1"          ></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Passwords.js?v2.16.0.1"              ></script>
-  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Users.js?v2.16.0.1"                  ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/explain/react.js?v2.17.0.0"          ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/explain/react-dom.js?v2.17.0.0"      ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/explain/d3.js?v2.17.0.0"             ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/explain/pgplan.js?v2.17.0.0"         ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/popper.min.js?v2.17.0.0"             ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/tooltip.min.js?v2.17.0.0"            ></script>
+	<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/jquery.dd.min.js?v2.17.0.0"          ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/xterm.js?v2.17.0.0"                  ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/fit.js?v2.17.0.0"                    ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/ace/ace.js?v2.17.0.0"               ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/ace/mode-sql.js?v2.17.0.0"          ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/ace/ext-language_tools.js?v2.17.0.0"></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/tabs/lib/tabs.js?v2.17.0.0"         ></script>
+	<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/handsontable.full.js?v2.17.0.0"      ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/NotificationControl.js?v2.17.0.0"    ></script>
+
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/WebSocketControl.js?v2.17.0.0"       ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Renderers.js?v2.17.0.0"              ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/HeaderActions.js?v2.17.0.0"          ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Passwords.js?v2.17.0.0"              ></script>
+  <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Users.js?v2.17.0.0"                  ></script>
 
   <script type="text/javascript">
 
diff --git a/OmniDB/OmniDB_app/templates/OmniDB_app/login.html b/OmniDB/OmniDB_app/templates/OmniDB_app/login.html
index 3fe9170e5..d6b9d94b9 100644
--- a/OmniDB/OmniDB_app/templates/OmniDB_app/login.html
+++ b/OmniDB/OmniDB_app/templates/OmniDB_app/login.html
@@ -4,7 +4,7 @@
 
 	<link rel="shortcut icon" type="image/x-icon" href="{{url_folder}}/static/OmniDB_app/images/favicon.ico" />
 
-	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/login.css?v2.16.0.1"/>
+	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/login.css?v2.17.0.0"/>
 </head>
 <body>
 	<div id="div_form">
diff --git a/OmniDB/OmniDB_app/templates/OmniDB_app/workspace.html b/OmniDB/OmniDB_app/templates/OmniDB_app/workspace.html
index 2607a1eb8..3c7b084c4 100644
--- a/OmniDB/OmniDB_app/templates/OmniDB_app/workspace.html
+++ b/OmniDB/OmniDB_app/templates/OmniDB_app/workspace.html
@@ -90,51 +90,51 @@
 
 {% endblock %}
 {% block include_css %}
-	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/lib/aimaraJS/css/Aimara.css?v2.16.0.1"           />
-	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/chartist.min.css?v2.16.0.1"                  />
-	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/jquery-ui.min.css?v2.16.0.1"                 />
-	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/jquery-ui.structure.min.css?v2.16.0.1"       />
-	<!--<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/lib/popupJS/popupJS.css?v2.16.0.1"               />-->
-	<!--<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/lib/emojionearea/emojionearea.min.css?v2.16.0.1" />-->
-	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/node-icon.css?v2.16.0.1"                    />
-	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/grid-icon.css?v2.16.0.1"                    />
-	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/interface-icon.css?v2.16.0.1"                    />
+	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/lib/aimaraJS/css/Aimara.css?v2.17.0.0"           />
+	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/chartist.min.css?v2.17.0.0"                  />
+	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/jquery-ui.min.css?v2.17.0.0"                 />
+	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/jquery-ui.structure.min.css?v2.17.0.0"       />
+	<!--<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/lib/popupJS/popupJS.css?v2.17.0.0"               />-->
+	<!--<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/lib/emojionearea/emojionearea.min.css?v2.17.0.0" />-->
+	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/node-icon.css?v2.17.0.0"                    />
+	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/grid-icon.css?v2.17.0.0"                    />
+	<link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/css/interface-icon.css?v2.17.0.0"                    />
 {% endblock %}
 {% block include %}
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/cytoscape/cytoscape.min.js?v2.16.0.1"                         ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/cytoscape/cytoscape-spread.js?v2.16.0.1"                      ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Chart.bundle.js?v2.16.0.1"                                 ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/chartist.min.js?v2.16.0.1"                                     ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/chartist-plugin-axistitle.min.js?v2.16.0.1"                    ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/aimaraJS/lib/Aimara.js?v2.16.0.1"                             ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/QueryClient.js?v2.16.0.1"                                      ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Query.js?v2.16.0.1"                                            ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/advancedObjectSearch.js?v2.16.0.1"                                       ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Debug.js?v2.16.0.1"                                            ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Workspace.js?v2.16.0.1"	      	                            ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/EditData.js?v2.16.0.1"				                            ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/AlterTable.js?v2.16.0.1"			                            ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/CreateTabFunctions.js?v2.16.0.1"                               ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Tree.js?v2.16.0.1"                                             ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/TreeSnippets.js?v2.16.0.1"                                     ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/TreeMonitor.js?v2.16.0.1"                                      ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/TreePostgresql.js?v2.16.0.1"                                   ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/TreeOracle.js?v2.16.0.1"                                       ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/TreeMariadb.js?v2.16.0.1"                                      ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/TreeMysql.js?v2.16.0.1"                                        ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/CommandHistory.js?v2.16.0.1"                                   ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/MonitorDashboard.js?v2.16.0.1"                                 ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Connections.js?v2.16.0.1"                                      ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/jquery-ui.min.js?v2.16.0.1"                                    ></script>
-<!--<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/popupJS/popupJS.js?v2.16.0.1"                                 ></script>-->
-<!--<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/emojionearea/emojionearea.min.js?v2.16.0.1"                   ></script>-->
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Properties.js?v2.16.0.1"                                       ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Shortcuts.js?v2.16.0.1"                                        ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Console.js?v2.16.0.1"                                          ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Terminal.js?v2.16.0.1"                                         ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/CustomMenu.js?v2.16.0.1"                                       ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/PluginHook.js?v2.16.0.1"                                       ></script>
-<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Autocomplete.js?v2.16.0.1"                                     ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/cytoscape/cytoscape.min.js?v2.17.0.0"                         ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/cytoscape/cytoscape-spread.js?v2.17.0.0"                      ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Chart.bundle.js?v2.17.0.0"                                 ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/chartist.min.js?v2.17.0.0"                                     ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/chartist-plugin-axistitle.min.js?v2.17.0.0"                    ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/aimaraJS/lib/Aimara.js?v2.17.0.0"                             ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/QueryClient.js?v2.17.0.0"                                      ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Query.js?v2.17.0.0"                                            ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/advancedObjectSearch.js?v2.17.0.0"                                       ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Debug.js?v2.17.0.0"                                            ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Workspace.js?v2.17.0.0"	      	                            ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/EditData.js?v2.17.0.0"				                            ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/AlterTable.js?v2.17.0.0"			                            ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/CreateTabFunctions.js?v2.17.0.0"                               ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Tree.js?v2.17.0.0"                                             ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/TreeSnippets.js?v2.17.0.0"                                     ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/TreeMonitor.js?v2.17.0.0"                                      ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/TreePostgresql.js?v2.17.0.0"                                   ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/TreeOracle.js?v2.17.0.0"                                       ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/TreeMariadb.js?v2.17.0.0"                                      ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/TreeMysql.js?v2.17.0.0"                                        ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/CommandHistory.js?v2.17.0.0"                                   ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/MonitorDashboard.js?v2.17.0.0"                                 ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Connections.js?v2.17.0.0"                                      ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/jquery-ui.min.js?v2.17.0.0"                                    ></script>
+<!--<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/popupJS/popupJS.js?v2.17.0.0"                                 ></script>-->
+<!--<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/emojionearea/emojionearea.min.js?v2.17.0.0"                   ></script>-->
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Properties.js?v2.17.0.0"                                       ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Shortcuts.js?v2.17.0.0"                                        ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Console.js?v2.17.0.0"                                          ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Terminal.js?v2.17.0.0"                                         ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/CustomMenu.js?v2.17.0.0"                                       ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/PluginHook.js?v2.17.0.0"                                       ></script>
+<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/Autocomplete.js?v2.17.0.0"                                     ></script>
 
 <script>
 	var v_query_port = {{ query_port }};
diff --git a/OmniDB/db.sqlite3 b/OmniDB/db.sqlite3
index d70237c2d..71166e827 100644
Binary files a/OmniDB/db.sqlite3 and b/OmniDB/db.sqlite3 differ
diff --git a/OmniDB/deploy/app_centos7/build.sh b/OmniDB/deploy/app_centos7/build.sh
index 57f406f76..cafbc9aac 100755
--- a/OmniDB/deploy/app_centos7/build.sh
+++ b/OmniDB/deploy/app_centos7/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-VERSION=2.16.0
+VERSION=2.17.0
 ARCH=centos-amd64
 
 echo "Installing OmniDB dependencies..."
diff --git a/OmniDB/deploy/app_debian8/build.sh b/OmniDB/deploy/app_debian8/build.sh
index 947b1b2cf..3c604db8e 100755
--- a/OmniDB/deploy/app_debian8/build.sh
+++ b/OmniDB/deploy/app_debian8/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2.16.0
+VERSION=2.17.0
 ARCH=debian-amd64
 
 echo "Installing OmniDB dependencies..."
diff --git a/OmniDB/deploy/plugin_centos6/build.sh b/OmniDB/deploy/plugin_centos6/build.sh
index 7097088cf..9b830564e 100755
--- a/OmniDB/deploy/plugin_centos6/build.sh
+++ b/OmniDB/deploy/plugin_centos6/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2.16.0
+VERSION=2.17.0
 ARCH=centos-amd64
 
 cd ~/OmniDB/omnidb_plugin
diff --git a/OmniDB/deploy/plugin_centos7/build.sh b/OmniDB/deploy/plugin_centos7/build.sh
index 465e4f961..54405da9a 100755
--- a/OmniDB/deploy/plugin_centos7/build.sh
+++ b/OmniDB/deploy/plugin_centos7/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2.16.0
+VERSION=2.17.0
 ARCH=centos-amd64
 
 cd ~/OmniDB/omnidb_plugin
diff --git a/OmniDB/deploy/plugin_debian8/build.sh b/OmniDB/deploy/plugin_debian8/build.sh
index b44f9da7f..462c8fdaa 100755
--- a/OmniDB/deploy/plugin_debian8/build.sh
+++ b/OmniDB/deploy/plugin_debian8/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2.16.0
+VERSION=2.17.0
 ARCH=debian-amd64
 
 cd ~/OmniDB/omnidb_plugin
diff --git a/OmniDB/deploy/plugin_freebsd/compile_instructions.txt b/OmniDB/deploy/plugin_freebsd/compile_instructions.txt
index 6e770ee9d..77da3315e 100644
--- a/OmniDB/deploy/plugin_freebsd/compile_instructions.txt
+++ b/OmniDB/deploy/plugin_freebsd/compile_instructions.txt
@@ -35,5 +35,5 @@ gcc -fPIC -o omnidb_plugin_11.so omnidb_plugin.o -lpq -shared
 
 rm -f *.o
 cd ..
-mv omnidb_plugin/ omnidb-plugin_2.16.0-freebsd-amd64
-tar -czvf omnidb-plugin_2.16.0-freebsd-amd64.tar.gz omnidb-plugin_2.16.0-freebsd-amd64/
+mv omnidb_plugin/ omnidb-plugin_2.17.0-freebsd-amd64
+tar -czvf omnidb-plugin_2.17.0-freebsd-amd64.tar.gz omnidb-plugin_2.17.0-freebsd-amd64/
diff --git a/OmniDB/deploy/plugin_freebsd/test_instructions.txt b/OmniDB/deploy/plugin_freebsd/test_instructions.txt
index 42c28d391..a25ac6702 100644
--- a/OmniDB/deploy/plugin_freebsd/test_instructions.txt
+++ b/OmniDB/deploy/plugin_freebsd/test_instructions.txt
@@ -3,11 +3,11 @@ pkg install postgresql11-server-11.0_2 postgresql11-contrib-11.0 postgresql11-cl
 
 su postgres
 cd
-wget --no-check-certificate https://omnidb.org/dist/2.16.0/omnidb-plugin_2.16.0-freebsd-amd64.tar.gz
-tar -xzvf omnidb-plugin_2.16.0-freebsd-amd64.tar.gz
+wget --no-check-certificate https://omnidb.org/dist/2.17.0/omnidb-plugin_2.17.0-freebsd-amd64.tar.gz
+tar -xzvf omnidb-plugin_2.17.0-freebsd-amd64.tar.gz
 exit
 
-cp /var/db/postgres/omnidb-plugin_2.16.0-freebsd-amd64/omnidb_plugin_10.so /usr/local/lib/postgresql/omnidb_plugin.so
+cp /var/db/postgres/omnidb-plugin_2.17.0-freebsd-amd64/omnidb_plugin_10.so /usr/local/lib/postgresql/omnidb_plugin.so
 
 service zerotier onestart
 zerotier-cli join <network>
@@ -28,7 +28,7 @@ psql
   create user omnidb with password 'omnidb';
   create database omnidb_tests owner omnidb;
 
-cd ~/omnidb-plugin_2.16.0-freebsd-amd64
+cd ~/omnidb-plugin_2.17.0-freebsd-amd64
 psql -d omnidb_tests -f debugger_schema.sql
 psql -d omnidb_tests -f sample_functions.sql
 psql -d omnidb_tests -c 'grant all on schema omnidb to omnidb'
diff --git a/OmniDB/deploy/server_centos6/build.sh b/OmniDB/deploy/server_centos6/build.sh
index 6ce5c8073..7ff82c566 100755
--- a/OmniDB/deploy/server_centos6/build.sh
+++ b/OmniDB/deploy/server_centos6/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-VERSION=2.16.0
+VERSION=2.17.0
 ARCH=centos-amd64
 
 echo "Installing OmniDB dependencies..."
diff --git a/OmniDB/deploy/server_centos7/build.sh b/OmniDB/deploy/server_centos7/build.sh
index c6211adce..19b73a21b 100755
--- a/OmniDB/deploy/server_centos7/build.sh
+++ b/OmniDB/deploy/server_centos7/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-VERSION=2.16.0
+VERSION=2.17.0
 ARCH=centos-amd64
 
 echo "Installing OmniDB dependencies..."
diff --git a/OmniDB/deploy/server_debian8/build.sh b/OmniDB/deploy/server_debian8/build.sh
index d05847929..56a7cf559 100755
--- a/OmniDB/deploy/server_debian8/build.sh
+++ b/OmniDB/deploy/server_debian8/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2.16.0
+VERSION=2.17.0
 ARCH=debian-amd64
 
 echo "Installing OmniDB dependencies..."
diff --git a/OmniDB/omnidb.db b/OmniDB/omnidb.db
index 348288dfb..633197dec 100644
Binary files a/OmniDB/omnidb.db and b/OmniDB/omnidb.db differ
diff --git a/README.md b/README.md
index 2dd5f93ec..2a810c6e2 100644
--- a/README.md
+++ b/README.md
@@ -7,12 +7,14 @@
 ## Release Notes
 
 - New features:
-  - Support to PostgreSQL 12
+  - Support to PostgreSQL 12.
 - Improvements:
-  - Table DDL panel shows generated columns
-  - Added SQL template for Cluster Index, accessible from context menu in TreeView
+  - Table DDL panel shows generated columns.
+  - Added SQL template for Cluster Index, accessible from context menu in TreeView.
+  - Added Advanced Object Search as an option in Inner Tab context menu.
 - Bug fixes:
-
+  - Server ping causing peaks of false positives in moments of brief network interruption or idle activities, or when the notebook running OmniDB was put to sleep.
+  - Render issue with graph chart type.
 
 **Full Documentation**: https://omnidb.readthedocs.io
 
diff --git a/omnidb_app/index.html b/omnidb_app/index.html
index 71e7fe702..17f8461d4 100644
--- a/omnidb_app/index.html
+++ b/omnidb_app/index.html
@@ -19,7 +19,7 @@
             <img src="images/omnidb_big.png">
           </div>
           <div class="version">
-            <small>v2.16.0</small>
+            <small>v2.17.0</small>
           </div>
         </div>
         <div id="loading" class="inputWrap">
diff --git a/omnidb_app/package.json b/omnidb_app/package.json
index b1f5e4a12..288d17757 100644
--- a/omnidb_app/package.json
+++ b/omnidb_app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "OmniDB",
-  "version": "2.16.0",
+  "version": "2.17.0",
   "description": "Database management application",
   "main": "main.js",
   "scripts": {
diff --git a/omnidb_plugin/README.md b/omnidb_plugin/README.md
index 72a6c9234..1090c1811 100644
--- a/omnidb_plugin/README.md
+++ b/omnidb_plugin/README.md
@@ -70,10 +70,10 @@ section 5.
 
 ```bash
 # For example, Debian-like 64 bits:
-sudo dpkg -i omnidb-plugin_2.16.0-debian-amd64.deb
+sudo dpkg -i omnidb-plugin_2.17.0-debian-amd64.deb
 
 # For example, for CentOS-like 64 bits:
-sudo rpm -ivU omnidb-plugin_2.16.0-centos-amd64.rpm
+sudo rpm -ivU omnidb-plugin_2.17.0-centos-amd64.rpm
 ```
 
 ### 1.2.2. Create a symlink
@@ -209,7 +209,7 @@ section 5.
 Download the tar.gz corresponding to your architecture from the website.
 
 ```bash
-wget --no-check-certificate https://omnidb.org/dist/2.16.0/omnidb-plugin_2.16.0-freebsd.tar.gz
+wget --no-check-certificate https://omnidb.org/dist/2.17.0/omnidb-plugin_2.17.0-freebsd.tar.gz
 ```
 
 ## 3.1. Installing the plugin
@@ -218,8 +218,8 @@ Move the omnidb_plugin.so corresponding to your PostgreSQL version to the folder
 *lib*, which is inside the folder where PostgreSQL was installed.
 
 ```bash
-tar -xzvf omnidb-plugin_2.16.0-freebsd.tar.gz
-cp omnidb-plugin_2.16.0-freebsd/omnidb_plugin_10.so /usr/local/lib/postgresql/omnidb_plugin.so
+tar -xzvf omnidb-plugin_2.17.0-freebsd.tar.gz
+cp omnidb-plugin_2.17.0-freebsd/omnidb_plugin_10.so /usr/local/lib/postgresql/omnidb_plugin.so
 ```
 
 ## 3.3. Set shared_preload_libraries
diff --git a/support_matrix.xlsx b/support_matrix.xlsx
index db32b5209..f1f875627 100644
Binary files a/support_matrix.xlsx and b/support_matrix.xlsx differ