diff --git a/.gitmodules b/.gitmodules
index 70cd92a17d..123c2e5569 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,4 +4,4 @@
 	branch = master
 [submodule "tensorflow"]
 	path = tensorflow
-	url = https://github.com/mozilla/tensorflow.git
+	url = https://github.com/lissyx/tensorflow.git
diff --git a/taskcluster/.build.yml b/taskcluster/.build.yml
index dfbb8c10f3..73d23769d6 100644
--- a/taskcluster/.build.yml
+++ b/taskcluster/.build.yml
@@ -23,7 +23,7 @@ build:
   nc_asset_name: 'native_client.tar.xz'
   args:
     tests_cmdline: ''
-  tensorflow_git_desc: 'TensorFlow: v2.3.0-6-g23ad988'
+  tensorflow_git_desc: 'TensorFlow: v2.3.0-7-g5531bd3'
   test_model_task: ''
   homebrew:
     url: ''
diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml
index 5fd271ea0e..8dc09488f3 100644
--- a/taskcluster/.shared.yml
+++ b/taskcluster/.shared.yml
@@ -14,6 +14,8 @@ deepspeech:
 tensorflow:
   packages_xenial:
     apt: 'apt-get -qq update && apt-get -qq -y install realpath build-essential python-virtualenv python-dev python-pip libblas-dev liblapack-dev gfortran wget software-properties-common pixz zip zlib1g-dev unzip'
+  packages_bionic:
+    apt: 'apt-get -qq update && apt-get -qq -y install coreutils build-essential python-virtualenv python-dev python-pip libblas-dev liblapack-dev gfortran wget software-properties-common pixz zip zlib1g-dev unzip'
   packages_win:
     pacman: 'pacman --noconfirm -S patch unzip tar'
     msys64: 'ln -s $USERPROFILE/msys64 $TASKCLUSTER_TASK_DIR/msys64'
@@ -140,38 +142,72 @@ system:
       namespace: "project.deepspeech.swig.win.amd64.1a4c14945012f1282c2eddc174fb7674d5295de8.0"
   tensorflow:
     linux_amd64_cpu:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.cpu/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.cpu"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.cpu/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.cpu"
     linux_amd64_cuda:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.cuda/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.cuda"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.cuda/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.cuda"
     linux_armv7:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.arm/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.arm"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.arm/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.arm"
     linux_arm64:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.arm64/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.arm64"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.arm64/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.arm64"
     darwin_amd64:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.osx/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.osx"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.osx/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.osx"
     android_arm64:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.android-arm64/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.android-arm64"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.android-arm64/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.android-arm64"
     android_armv7:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.android-armv7/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.android-armv7"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.android-armv7/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.android-armv7"
     win_amd64_cpu:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.win/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.win"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.win/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.win"
     win_amd64_cuda:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.win-cuda/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.win-cuda"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.win-cuda/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.win-cuda"
     ios_arm64:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.ios_arm64/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.ios_arm64"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.ios_arm64/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.ios_arm64"
     ios_x86_64:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.ios_x86_64/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.ios_x86_64"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.ios_x86_64/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.ios_x86_64"
+  tensorflow_dbg:
+    linux_amd64_cpu:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.cpu/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.cpu"
+    linux_amd64_cuda:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.cuda/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.cuda"
+    linux_armv7:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.arm/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.arm"
+    linux_arm64:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.arm64/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.arm64"
+    darwin_amd64:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.osx/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.osx"
+    android_arm64:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.android-arm64/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.android-arm64"
+    android_armv7:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.android-armv7/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.android-armv7"
+    win_amd64_cpu:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.win/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.win"
+    win_amd64_cuda:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.win-cuda/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.win-cuda"
+    ios_arm64:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.ios_arm64/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.ios_arm64"
+    ios_x86_64:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.ios_x86_64/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.5531bd33875d7e1019d6b7aa51ec0675789c3908.0.ios_x86_64"
   username: 'build-user'
   homedir:
     linux: '/home/build-user'
diff --git a/taskcluster/tf_android-arm64-dbg.yml b/taskcluster/tf_android-arm64-dbg.yml
new file mode 100644
index 0000000000..5aa582fcc4
--- /dev/null
+++ b/taskcluster/tf_android-arm64-dbg.yml
@@ -0,0 +1,17 @@
+build:
+  template_file: generic_tc_caching-linux-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.android_arm64.url}
+    artifact_namespace: ${system.tensorflow_dbg.android_arm64.namespace}
+  system_config:
+    >
+      ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh --android-arm64"
+    build: "taskcluster/tf_tc-build.sh --android-arm64 dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
+  metadata:
+    name: "TensorFlow Android ARM64 debug"
+    description: "Building TensorFlow for Android ARM64, debug version"
diff --git a/taskcluster/tf_android-armv7-dbg.yml b/taskcluster/tf_android-armv7-dbg.yml
new file mode 100644
index 0000000000..43378f31d3
--- /dev/null
+++ b/taskcluster/tf_android-armv7-dbg.yml
@@ -0,0 +1,17 @@
+build:
+  template_file: generic_tc_caching-linux-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.android_armv7.url}
+    artifact_namespace: ${system.tensorflow_dbg.android_armv7.namespace}
+  system_config:
+    >
+      ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh --android-armv7"
+    build: "taskcluster/tf_tc-build.sh --android-armv7 dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
+  metadata:
+    name: "TensorFlow Android ARMv7 debug"
+    description: "Building TensorFlow for Android ARMv7, debug version"
diff --git a/taskcluster/tf_linux-amd64-cpu-dbg.yml b/taskcluster/tf_linux-amd64-cpu-dbg.yml
new file mode 100644
index 0000000000..9a8bc0c5ea
--- /dev/null
+++ b/taskcluster/tf_linux-amd64-cpu-dbg.yml
@@ -0,0 +1,17 @@
+build:
+  template_file: generic_tc_caching-linux-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.linux_amd64_cpu.url}
+    artifact_namespace: ${system.tensorflow_dbg.linux_amd64_cpu.namespace}
+  system_config:
+    >
+      ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh"
+    build: "taskcluster/tf_tc-build.sh --linux-cpu dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
+  metadata:
+    name: "TensorFlow Linux AMD64 CPU debug"
+    description: "Building TensorFlow for Linux/AMD64, CPU only, debug version"
diff --git a/taskcluster/tf_linux-amd64-gpu-dbg.yml b/taskcluster/tf_linux-amd64-gpu-dbg.yml
new file mode 100644
index 0000000000..77bc5fc5f5
--- /dev/null
+++ b/taskcluster/tf_linux-amd64-gpu-dbg.yml
@@ -0,0 +1,17 @@
+build:
+  template_file: generic_tc_caching-linux-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.linux_amd64_cuda.url}
+    artifact_namespace: ${system.tensorflow_dbg.linux_amd64_cuda.namespace}
+  system_config:
+    >
+      ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh --linux-cuda"
+    build: "taskcluster/tf_tc-build.sh --linux-cuda dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
+  metadata:
+    name: "TensorFlow Linux AMD64 CUDA debug"
+    description: "Building TensorFlow for Linux/AMD64, CUDA-enabled, debug version"
diff --git a/taskcluster/tf_linux-arm64-cpu-dbg.yml b/taskcluster/tf_linux-arm64-cpu-dbg.yml
new file mode 100644
index 0000000000..2e01f111e9
--- /dev/null
+++ b/taskcluster/tf_linux-arm64-cpu-dbg.yml
@@ -0,0 +1,17 @@
+build:
+  template_file: generic_tc_caching-linux-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.linux_arm64.url}
+    artifact_namespace: ${system.tensorflow_dbg.linux_arm64.namespace}
+  system_config:
+    >
+      ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh"
+    build: "taskcluster/tf_tc-build.sh --linux-arm64 dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
+  metadata:
+    name: "TensorFlow Linux ARM64 Cortex-A53 CPU debug"
+    description: "Building TensorFlow for Linux ARM64 Cortex-A53, CPU only, debug version"
diff --git a/taskcluster/tf_linux-rpi3-cpu-dbg.yml b/taskcluster/tf_linux-rpi3-cpu-dbg.yml
new file mode 100644
index 0000000000..a1772a98ea
--- /dev/null
+++ b/taskcluster/tf_linux-rpi3-cpu-dbg.yml
@@ -0,0 +1,17 @@
+build:
+  template_file: generic_tc_caching-linux-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.linux_armv7.url}
+    artifact_namespace: ${system.tensorflow_dbg.linux_armv7.namespace}
+  system_config:
+    >
+      ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh"
+    build: "taskcluster/tf_tc-build.sh --linux-arm dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
+  metadata:
+    name: "TensorFlow Linux RPi3/ARMv7 CPU debug"
+    description: "Building TensorFlow for Linux RPi3 ARMv7, CPU only, debug version"
diff --git a/taskcluster/tf_tc-build.sh b/taskcluster/tf_tc-build.sh
index 93287bd50c..e05b157da6 100755
--- a/taskcluster/tf_tc-build.sh
+++ b/taskcluster/tf_tc-build.sh
@@ -14,32 +14,37 @@ pushd ${DS_ROOT_TASK}/DeepSpeech/ds/tensorflow/
     # Force toolchain sync (useful on macOS ?)
     bazel ${BAZEL_OUTPUT_USER_ROOT} sync --configure
 
-    OPT_OR_DBG=${2:-opt}
+    MAYBE_DEBUG=$2
+    OPT_OR_DBG="-c opt"
+    if [ "${MAYBE_DEBUG}" = "dbg" ]; then
+	OPT_OR_DBG="--config=dbg"
+    fi;
+
 
     case "$1" in
     "--linux-cpu"|"--darwin-cpu"|"--windows-cpu")
-        echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_OPT_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LIB_CPP_API} ${BUILD_TARGET_LITE_LIB}
+        echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} ${OPT_OR_DBG} ${BAZEL_OPT_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LIB_CPP_API} ${BUILD_TARGET_LITE_LIB}
         ;;
     "--linux-cuda"|"--windows-cuda")
-        eval "export ${TF_CUDA_FLAGS}" && (echo "" | TF_NEED_CUDA=1 ./configure) && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_CUDA_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BAZEL_OPT_FLAGS} ${BUILD_TARGET_LIB_CPP_API}
+        eval "export ${TF_CUDA_FLAGS}" && (echo "" | TF_NEED_CUDA=1 ./configure) && ${BAZEL_BUILD} ${OPT_OR_DBG} ${BAZEL_CUDA_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BAZEL_OPT_FLAGS} ${BUILD_TARGET_LIB_CPP_API}
         ;;
     "--linux-arm")
-        echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_ARM_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
+        echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} ${OPT_OR_DBG} ${BAZEL_ARM_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
         ;;
     "--linux-arm64")
-        echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_ARM64_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
+        echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} ${OPT_OR_DBG} ${BAZEL_ARM64_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
         ;;
     "--android-armv7")
-        echo "" | TF_SET_ANDROID_WORKSPACE=1 ./configure && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_ANDROID_ARM_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
+        echo "" | TF_SET_ANDROID_WORKSPACE=1 ./configure && ${BAZEL_BUILD} ${OPT_OR_DBG} ${BAZEL_ANDROID_ARM_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
         ;;
     "--android-arm64")
-        echo "" | TF_SET_ANDROID_WORKSPACE=1 ./configure && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_ANDROID_ARM64_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
+        echo "" | TF_SET_ANDROID_WORKSPACE=1 ./configure && ${BAZEL_BUILD} ${OPT_OR_DBG} ${BAZEL_ANDROID_ARM64_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
         ;;
     "--ios-arm64")
-        echo "" | TF_NEED_CUDA=0 TF_CONFIGURE_IOS=1 ./configure && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_IOS_ARM64_FLAGS} ${BUILD_TARGET_LITE_LIB}
+        echo "" | TF_NEED_CUDA=0 TF_CONFIGURE_IOS=1 ./configure && ${BAZEL_BUILD} ${OPT_OR_DBG} ${BAZEL_IOS_ARM64_FLAGS} ${BUILD_TARGET_LITE_LIB}
         ;;
     "--ios-x86_64")
-        echo "" | TF_NEED_CUDA=0 TF_CONFIGURE_IOS=1 ./configure && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_IOS_X86_64_FLAGS} ${BUILD_TARGET_LITE_LIB}
+        echo "" | TF_NEED_CUDA=0 TF_CONFIGURE_IOS=1 ./configure && ${BAZEL_BUILD} ${OPT_OR_DBG} ${BAZEL_IOS_X86_64_FLAGS} ${BUILD_TARGET_LITE_LIB}
         ;;
     esac
 
diff --git a/tensorflow b/tensorflow
index 23ad988fcd..5531bd3387 160000
--- a/tensorflow
+++ b/tensorflow
@@ -1 +1 @@
-Subproject commit 23ad988fcde60fb01f9533e95004bbc4877a9143
+Subproject commit 5531bd33875d7e1019d6b7aa51ec0675789c3908