diff --git a/CHANGELOG.md b/CHANGELOG.md
index 204a5824..7f55d79d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to the "vscode-java-test" extension will be documented in th
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 0.40.0
+### Added
+- support to specify java executable. [PR#1602](https://github.com/microsoft/vscode-java-test/pull/1602), contributed by [@gayanper](https://github.com/gayanper)
+
+### Fixed
+- Editor gutter shortcuts disappear. [#1604](https://github.com/microsoft/vscode-java-test/issues/1604)
+
 ## 0.39.1
 ### Removed
 - Remove marketplace preview flag. [PR#1592](https://github.com/microsoft/vscode-java-test/pull/1592)
diff --git a/java-extension/build-tools/pom.xml b/java-extension/build-tools/pom.xml
index 3de51f8a..028b048d 100644
--- a/java-extension/build-tools/pom.xml
+++ b/java-extension/build-tools/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.java.test</groupId>
         <artifactId>parent</artifactId>
-        <version>0.39.1</version>
+        <version>0.40.0</version>
     </parent>
     <groupId>com.microsoft.java.test</groupId>
     <artifactId>test-runner-build-tools</artifactId>
diff --git a/java-extension/com.microsoft.java.test.plugin.site/category.xml b/java-extension/com.microsoft.java.test.plugin.site/category.xml
index ae49d3fa..d951be6e 100644
--- a/java-extension/com.microsoft.java.test.plugin.site/category.xml
+++ b/java-extension/com.microsoft.java.test.plugin.site/category.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <bundle id="com.microsoft.java.test.plugin" version="0.39.1"/>
+   <bundle id="com.microsoft.java.test.plugin" version="0.40.0"/>
 </site>
diff --git a/java-extension/com.microsoft.java.test.plugin.site/pom.xml b/java-extension/com.microsoft.java.test.plugin.site/pom.xml
index 532e933f..45a2ff94 100644
--- a/java-extension/com.microsoft.java.test.plugin.site/pom.xml
+++ b/java-extension/com.microsoft.java.test.plugin.site/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>parent</artifactId>
 		<groupId>com.microsoft.java.test</groupId>
-		<version>0.39.1</version>
+		<version>0.40.0</version>
 	</parent>
 	<artifactId>com.microsoft.java.test.plugin.site</artifactId>
 	<packaging>eclipse-repository</packaging>
diff --git a/java-extension/com.microsoft.java.test.plugin/META-INF/MANIFEST.MF b/java-extension/com.microsoft.java.test.plugin/META-INF/MANIFEST.MF
index 28832dce..c7aa6d11 100644
--- a/java-extension/com.microsoft.java.test.plugin/META-INF/MANIFEST.MF
+++ b/java-extension/com.microsoft.java.test.plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.microsoft.java.test.plugin
 Bundle-SymbolicName: com.microsoft.java.test.plugin;singleton:=true
-Bundle-Version: 0.39.1
+Bundle-Version: 0.40.0
 Bundle-Activator: com.microsoft.java.test.plugin.util.JUnitPlugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.jdt.core,
diff --git a/java-extension/com.microsoft.java.test.plugin/pom.xml b/java-extension/com.microsoft.java.test.plugin/pom.xml
index 6100e970..e4fbb170 100644
--- a/java-extension/com.microsoft.java.test.plugin/pom.xml
+++ b/java-extension/com.microsoft.java.test.plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.microsoft.java.test</groupId>
         <artifactId>parent</artifactId>
-        <version>0.39.1</version>
+        <version>0.40.0</version>
     </parent>
     <artifactId>com.microsoft.java.test.plugin</artifactId>
     <packaging>eclipse-plugin</packaging>
diff --git a/java-extension/com.microsoft.java.test.runner/pom.xml b/java-extension/com.microsoft.java.test.runner/pom.xml
index 01903253..3a897de4 100644
--- a/java-extension/com.microsoft.java.test.runner/pom.xml
+++ b/java-extension/com.microsoft.java.test.runner/pom.xml
@@ -4,7 +4,7 @@
   <parent>
   	<groupId>com.microsoft.java.test</groupId>
     <artifactId>parent</artifactId>
-    <version>0.39.1</version>
+    <version>0.40.0</version>
   </parent>
   <artifactId>com.microsoft.java.test.runner</artifactId>
   <packaging>jar</packaging>
diff --git a/java-extension/com.microsoft.java.test.target/pom.xml b/java-extension/com.microsoft.java.test.target/pom.xml
index a732b56c..b268e0e1 100644
--- a/java-extension/com.microsoft.java.test.target/pom.xml
+++ b/java-extension/com.microsoft.java.test.target/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.microsoft.java.test</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.39.1</version>
+		<version>0.40.0</version>
 	</parent>
 	<artifactId>com.microsoft.java.test.tp</artifactId>
 	<name>${base.name} :: Target Platform</name>
diff --git a/java-extension/pom.xml b/java-extension/pom.xml
index f62905c0..65447c48 100644
--- a/java-extension/pom.xml
+++ b/java-extension/pom.xml
@@ -4,7 +4,7 @@
     <groupId>com.microsoft.java.test</groupId>
     <artifactId>parent</artifactId>
     <name>${base.name} :: Parent</name>
-    <version>0.39.1</version>
+    <version>0.40.0</version>
     <packaging>pom</packaging>
     <properties>
         <base.name>Test Runner for Java</base.name>
diff --git a/package-lock.json b/package-lock.json
index 014097cb..0018d14f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "vscode-java-test",
-    "version": "0.39.1",
+    "version": "0.40.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "vscode-java-test",
-            "version": "0.39.1",
+            "version": "0.40.0",
             "dependencies": {
                 "fs-extra": "^10.1.0",
                 "get-port": "^4.2.0",
diff --git a/package.json b/package.json
index 4fcf467f..8a1a3f6a 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "repository": {
         "url": "https://github.com/Microsoft/vscode-java-test"
     },
-    "version": "0.39.1",
+    "version": "0.40.0",
     "publisher": "vscjava",
     "bugs": {
         "url": "https://github.com/Microsoft/vscode-java-test/issues"
@@ -71,7 +71,7 @@
             "./server/org.eclipse.jdt.junit4.runtime_1.3.0.v20220609-1843.jar",
             "./server/org.eclipse.jdt.junit5.runtime_1.1.100.v20220907-0450.jar",
             "./server/org.opentest4j_1.2.0.jar",
-            "./server/com.microsoft.java.test.plugin-0.39.1.jar"
+            "./server/com.microsoft.java.test.plugin-0.40.0.jar"
         ],
         "viewsWelcome": [
             {