diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 969ebe9aecc..692ebac7fff 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,6 +40,35 @@ jobs:
       - name: Run lint checks
         run: |
           mvn compiler:compile -Pdev,jdk11 -B -U -e
+  test-mr:
+    if: github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'CI build')
+    runs-on: ubuntu-latest
+    container: centos:7
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v1
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Install environment
+        run: |
+          echo Downloading Maven
+          curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz -o $HOME/apache-maven-3.6.3-bin.tar.gz
+          tar xzf $HOME/apache-maven-3.6.3-bin.tar.gz -C /opt/
+          ln -sf /opt/apache-maven-3.6.3/bin/mvn /usr/bin/mvn
+      - name: Build project
+        run: |
+          mvn -version
+          mvn clean install -Pdev -B -U -e -Dlint.skip=true
+      - name: Setup Java 8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - name: Java 8 tests
+        run: |
+          mvn -version
+          mvn surefire:test -Pdev -B -U -e -Dlint.skip=true
   check-format:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
diff --git a/tensorflow-core/tensorflow-core-api/pom.xml b/tensorflow-core/tensorflow-core-api/pom.xml
index 4ebe1234e80..7fc261401a9 100644
--- a/tensorflow-core/tensorflow-core-api/pom.xml
+++ b/tensorflow-core/tensorflow-core-api/pom.xml
@@ -169,6 +169,22 @@
               <generatedSourcesDirectory>${project.basedir}/src/gen/annotations</generatedSourcesDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>compile-java-11</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <release>11</release>
+              <source>11</source>
+              <target>11</target>
+              <compileSourceRoots>
+                <compileSourceRoot>${project.basedir}/src/main/java11</compileSourceRoot>
+              </compileSourceRoots>
+              <multiReleaseOutput>true</multiReleaseOutput>
+            </configuration>
+          </execution>
           <!--
           Compile JavaCPP presets
             This must be done prematurely, at the generate-sources phase, since the javacpp-plugin
@@ -372,6 +388,7 @@
           <archive>
             <manifestEntries>
               <Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
+              <Multi-Release>true</Multi-Release>
             </manifestEntries>
           </archive>
         </configuration>
@@ -482,6 +499,20 @@
           </descriptorRefs>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>${spotless.version}</version>
+        <configuration>
+          <java>
+            <includes>
+              <include>src/main/java/**/*.java</include>
+              <include>src/test/java/**/*.java</include>
+              <include>src/main/java11/**/*.java</include>
+            </includes>
+          </java>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/MRTest.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/MRTest.java
new file mode 100644
index 00000000000..c0dafb416ef
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/MRTest.java
@@ -0,0 +1,24 @@
+/*
+ Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=======================================================================
+
+*/
+package org.tensorflow;
+
+class MRTest {
+  static int version() {
+    return 8;
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java11/org/tensorflow/MRTest.java b/tensorflow-core/tensorflow-core-api/src/main/java11/org/tensorflow/MRTest.java
new file mode 100644
index 00000000000..b05d1317579
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/main/java11/org/tensorflow/MRTest.java
@@ -0,0 +1,24 @@
+/*
+ Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=======================================================================
+
+*/
+package org.tensorflow;
+
+class MRTest {
+  static int version() {
+    return 11;
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java
new file mode 100644
index 00000000000..4bbde9b4536
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java
@@ -0,0 +1,39 @@
+/*
+ Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=======================================================================
+
+*/
+package org.tensorflow;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class MultiReleaseTest {
+
+  @Test
+  public void testMultirelease() {
+    String javaVersion = System.getProperty("java.version");
+    System.out.println("Testing on Java version " + javaVersion);
+    int value = MRTest.version();
+    int majorVersion = Integer.parseInt(javaVersion.substring(0, javaVersion.indexOf('.')));
+
+    if (majorVersion >= 11) {
+      assertEquals(11, value);
+    } else {
+      assertEquals(8, value);
+    }
+  }
+}