diff --git a/build.gradle b/build.gradle
index 5350d8087..12a30af13 100644
--- a/build.gradle
+++ b/build.gradle
@@ -131,7 +131,7 @@ dependencies {
     // Other dependencies we're unable to resolve via standard repositories
 
     if (buildAccess == 'internal') {
-        preCompile group: 'gov.nasa.jpl.cae.magicdraw', name: 'cae-magicdraw-core', version: '3.5.1', ext: 'zip'
+        preCompile group: 'gov.nasa.jpl.cae.magicdraw', name: 'cae-magicdraw-core', version: '3.5.2', ext: 'zip'
     }
     else {
         preCompile group: 'com.nomagic', name: 'magicdraw', version: '185sp3', classifier: 'MagicDraw_185_sp3_no_install', ext: 'zip'
diff --git a/gradle.properties b/gradle.properties
index 8f2b0eda9..8904703e4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=3.5.1
+version=3.5.2
 group=org.openmbee.magicdraw.mdk
 descriptorFile=MDR_Plugin_Model_Development_Kit_91110_descriptor.xml
 magicdDrawGroupName=gov.nasa.jpl.cae.magicdraw.mdk
diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/mms/MMSDeltaProjectEventListenerAdapter.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/mms/MMSDeltaProjectEventListenerAdapter.java
index 0457c76aa..7e41ab17c 100644
--- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/mms/MMSDeltaProjectEventListenerAdapter.java
+++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/mms/MMSDeltaProjectEventListenerAdapter.java
@@ -163,6 +163,7 @@ public synchronized boolean update() throws URISyntaxException, IOException, Ser
             if (!project.isRemote()) {
                 return false;
             }
+            // TODO test if branch exists to avoid 404 on commits GET
             if (!TicketUtils.isTicketSet(project)) {
                 inMemoryCommits.clear();
                 inMemoryChangelog.clear();
diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/TaskRunner.java b/src/main/java/gov/nasa/jpl/mbee/mdk/util/TaskRunner.java
index 7ad6e9d81..8c67c80dd 100644
--- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/TaskRunner.java
+++ b/src/main/java/gov/nasa/jpl/mbee/mdk/util/TaskRunner.java
@@ -20,7 +20,8 @@
 import java.util.function.BiFunction;
 
 public class TaskRunner {
-    private static final ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(0);
+    // Cannot set corePoolSize to 0 due to bug that causes high CPU usage https://bugs.openjdk.java.net/browse/JDK-8129861
+    private static final ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(1);
 
     public static Future<?> runWithProgressStatus(Runnable runnable, String title, ThreadExecutionStrategy strategy) {
         return runWithProgressStatus(runnable, title, strategy, false);