diff --git a/build.gradle b/build.gradle
index afb45c7cd1..aef2174fe8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ buildscript {
 
   // Dependency versions
   // ---------------------------------------
-  
+
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13"
   ext.testNgVersion = "7.0.0"
@@ -20,7 +20,7 @@ buildscript {
 
   // --------------------------------------
 
-  repositories { 
+  repositories {
     jcenter()
     mavenCentral()
     maven {
@@ -57,7 +57,7 @@ description = "RxJava: Reactive Extensions for the JVM – a library for composi
 
 apply plugin: "java-library"
 apply plugin: "checkstyle"
-apply plugin: "jacoco"
+//apply plugin: "jacoco"
 apply plugin: "ru.vyarus.animalsniffer"
 apply plugin: "maven"
 apply plugin: "me.champeau.gradle.jmh"
@@ -191,7 +191,7 @@ publishing {
     publications {
         mavenJava(MavenPublication) {
             from components.java
-            artifact (sourcesJar) { 
+            artifact (sourcesJar) {
                 classifier = "sources"
             }
         }
@@ -228,7 +228,7 @@ plugins.withType(EclipsePlugin) {
 }
 
 test {
-    
+
     testLogging  {
         // showing skipped occasionally should prevent CI timeout due to lack of standard output
         events=["skipped", "failed"] // "started", "passed"
@@ -240,7 +240,7 @@ test {
 
         info.events = ["failed", "skipped"]
         info.exceptionFormat="full"
-        
+
         warn.events = ["failed", "skipped"]
         warn.exceptionFormat="full"
     }
@@ -252,7 +252,7 @@ test {
     }
 }
 
-task testng(type: Test) { 
+task testng(type: Test) {
      useTestNG()
      testLogging  {
         events=["skipped", "failed"]
@@ -263,17 +263,17 @@ task testng(type: Test) {
 
         info.events = ["failed", "skipped"]
         info.exceptionFormat="full"
-        
+
         warn.events = ["failed", "skipped"]
         warn.exceptionFormat="full"
      }
-} 
+}
 
-check.dependsOn testng 
+check.dependsOn testng
 
-jacoco {
-    toolVersion = jacocoVersion // See http://www.eclemma.org/jacoco/.
-}
+//jacoco {
+//    toolVersion = jacocoVersion // See http://www.eclemma.org/jacoco/.
+//}
 
 task GCandMem(dependsOn: "check") doLast {
     print("Memory usage before: ")
@@ -295,16 +295,7 @@ task GCandMem2(dependsOn: "test") doLast {
 
 testng.dependsOn GCandMem2
 
-jacocoTestReport {
-    reports {
-        xml.enabled = true
-        html.enabled = true
-    }
-}
-
-jacocoTestReport.dependsOn GCandMem
-
-build.dependsOn jacocoTestReport
+build.dependsOn
 
 checkstyle {
     configFile file("checkstyle.xml")
@@ -316,25 +307,25 @@ if (rootProject.hasProperty("releaseMode")) {
 
   if ("branch".equals(rootProject.releaseMode)) {
     // From https://github.com/ReactiveX/RxAndroid/blob/2.x/rxandroid/build.gradle#L94
-  
+
     println("ReleaseMode: " + rootProject.releaseMode);
     artifactory {
         contextUrl = "https://oss.jfrog.org"
-    
+
         publish {
             repository {
                 repoKey = "oss-snapshot-local"
-    
+
                 username = rootProject.bintrayUser
                 password = rootProject.bintrayKey
             }
-    
+
             defaults {
                 publishConfigs("archives")
             }
         }
     }
-    
+
     build.finalizedBy(artifactoryPublish)
   }
 
@@ -362,7 +353,7 @@ if (rootProject.hasProperty("releaseMode")) {
                 sign = true
              }
              mavenCentralSync {
-               sync = true 
+               sync = true
                user = rootProject.sonatypeUsername
                password = rootProject.sonatypePassword
                close = "1"
@@ -370,7 +361,7 @@ if (rootProject.hasProperty("releaseMode")) {
            }
          }
       }
-      
+
       build.finalizedBy(bintrayUpload)
    }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 94920145f3..622ab64a3c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactory.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactory.java
index 5bd0614b89..6d9a0ac0d2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactory.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactory.java
@@ -73,7 +73,8 @@ public Thread newThread(@NonNull Runnable r) {
 //        }
 
         String name = nameBuilder.toString();
-        Thread t = nonBlocking ? new RxCustomThread(r, name) : new Thread(r, name);
+        //        Thread t = nonBlocking ? new RxCustomThread(r, name) : new Thread(r, name);
+        Thread t = Thread.newThread(name, Thread.VIRTUAL, r);
         t.setPriority(priority);
         t.setDaemon(true);
         return t;