diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml
index c110a232b..46d4cf602 100644
--- a/.github/workflows/osrm-backend.yml
+++ b/.github/workflows/osrm-backend.yml
@@ -107,30 +107,30 @@ jobs:
     strategy:
       matrix:
         include:
-          # - name: gcc-9-debug-cov
-          #   continue-on-error: false
-          #   node: 12
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TOOLS: ON
-          #   BUILD_TYPE: Debug
-          #   CCOMPILER: gcc-9
-          #   CUCUMBER_TIMEOUT: 20000
-          #   CXXCOMPILER: g++-9
-          #   ENABLE_COVERAGE: ON
+          - name: gcc-9-debug-cov
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Debug
+            CCOMPILER: gcc-9
+            CUCUMBER_TIMEOUT: 20000
+            CXXCOMPILER: g++-9
+            ENABLE_COVERAGE: ON
 
-          # - name: gcc-9-debug-asan-ubsan
-          #   continue-on-error: false
-          #   node: 12
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TOOLS: ON
-          #   BUILD_TYPE: Debug
-          #   CCOMPILER: gcc-9
-          #   CUCUMBER_TIMEOUT: 20000
-          #   CXXCOMPILER: g++-9
-          #   ENABLE_SANITIZER: ON
-          #   TARGET_ARCH: x86_64-asan-ubsan
-          #   OSRM_CONNECTION_RETRIES: 10
-          #   OSRM_CONNECTION_EXP_BACKOFF_COEF: 1.5
+          - name: gcc-9-debug-asan-ubsan
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Debug
+            CCOMPILER: gcc-9
+            CUCUMBER_TIMEOUT: 20000
+            CXXCOMPILER: g++-9
+            ENABLE_SANITIZER: ON
+            TARGET_ARCH: x86_64-asan-ubsan
+            OSRM_CONNECTION_RETRIES: 10
+            OSRM_CONNECTION_EXP_BACKOFF_COEF: 1.5
 
           - name: clang-6.0-debug
             continue-on-error: false
@@ -153,268 +153,268 @@ jobs:
             CUCUMBER_TIMEOUT: 60000
             ENABLE_CLANG_TIDY: ON
 
-          # - name: conan-linux-debug-asan-ubsan
-          #   continue-on-error: false
-          #   node: 12
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TOOLS: ON
-          #   BUILD_TYPE: Release
-          #   CLANG_VERSION: 11
-          #   ENABLE_CONAN: ON
-          #   ENABLE_SANITIZER: ON
+          - name: conan-linux-debug-asan-ubsan
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Release
+            CLANG_VERSION: 11
+            ENABLE_CONAN: ON
+            ENABLE_SANITIZER: ON
 
-          # - name: conan-linux-release
-          #   continue-on-error: false
-          #   node: 12
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TOOLS: ON
-          #   BUILD_TYPE: Release
-          #   CLANG_VERSION: 6
-          #   ENABLE_CONAN: ON
+          - name: conan-linux-release
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Release
+            CLANG_VERSION: 6
+            ENABLE_CONAN: ON
 
-          # - name: gcc-11-release
-          #   continue-on-error: false
-          #   node: 12
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TOOLS: ON
-          #   BUILD_TYPE: Release
-          #   CCOMPILER: gcc-11
-          #   CXXCOMPILER: g++-11
+          - name: gcc-11-release
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Release
+            CCOMPILER: gcc-11
+            CXXCOMPILER: g++-11
 
-          # - name: gcc-10-release
-          #   continue-on-error: false
-          #   node: 12
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TOOLS: ON
-          #   BUILD_TYPE: Release
-          #   CCOMPILER: gcc-10
-          #   CXXCOMPILER: g++-10
+          - name: gcc-10-release
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Release
+            CCOMPILER: gcc-10
+            CXXCOMPILER: g++-10
 
-          # - name: gcc-9-release
-          #   continue-on-error: false
-          #   node: 12
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TOOLS: ON
-          #   BUILD_TYPE: Release
-          #   CCOMPILER: gcc-9
-          #   CXXCOMPILER: g++-9
-          #   CXXFLAGS: -Wno-cast-function-type
+          - name: gcc-9-release
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Release
+            CCOMPILER: gcc-9
+            CXXCOMPILER: g++-9
+            CXXFLAGS: -Wno-cast-function-type
 
-          # - name: gcc-9-conan-release-i686
-          #   continue-on-error: false
-          #   node: 12
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TOOLS: ON
-          #   BUILD_TYPE: Release
-          #   CCOMPILER: gcc-9
-          #   CFLAGS: "-m32 -msse2 -mfpmath=sse"
-          #   CXXCOMPILER: g++-9
-          #   CXXFLAGS: "-m32 -msse2 -mfpmath=sse"
-          #   TARGET_ARCH: i686
-          #   ENABLE_CONAN: ON
+          - name: gcc-9-conan-release-i686
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Release
+            CCOMPILER: gcc-9
+            CFLAGS: "-m32 -msse2 -mfpmath=sse"
+            CXXCOMPILER: g++-9
+            CXXFLAGS: "-m32 -msse2 -mfpmath=sse"
+            TARGET_ARCH: i686
+            ENABLE_CONAN: ON
             
-          # - name: gcc-8-release
-          #   continue-on-error: false
-          #   node: 12
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TOOLS: ON
-          #   BUILD_TYPE: Release
-          #   CCOMPILER: gcc-8
-          #   CXXCOMPILER: g++-8
-          #   CXXFLAGS: -Wno-cast-function-type
+          - name: gcc-8-release
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Release
+            CCOMPILER: gcc-8
+            CXXCOMPILER: g++-8
+            CXXFLAGS: -Wno-cast-function-type
 
-          # - name: gcc-7-release
-          #   continue-on-error: false
-          #   node: 12
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TOOLS: ON
-          #   BUILD_TYPE: Release
-          #   CCOMPILER: gcc-7
-          #   CXXCOMPILER: g++-7
+          - name: gcc-7-release
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Release
+            CCOMPILER: gcc-7
+            CXXCOMPILER: g++-7
 
-          # - name: conan-osx-release-node-12
-          #   build_node_package: true
-          #   continue-on-error: false
-          #   node: 12
-          #   runs-on: macos-11
-          #   BUILD_TOOLS: ON
-          #   BUILD_TYPE: Release
-          #   CCOMPILER: clang
-          #   CXXCOMPILER: clang++
-          #   CUCUMBER_TIMEOUT: 60000
-          #   ENABLE_ASSERTIONS: ON
-          #   ENABLE_CONAN: ON
+          - name: conan-osx-release-node-12
+            build_node_package: true
+            continue-on-error: false
+            node: 12
+            runs-on: macos-11
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Release
+            CCOMPILER: clang
+            CXXCOMPILER: clang++
+            CUCUMBER_TIMEOUT: 60000
+            ENABLE_ASSERTIONS: ON
+            ENABLE_CONAN: ON
 
-          # - name: conan-osx-release-node-14
-          #   build_node_package: true
-          #   continue-on-error: false
-          #   node: 14
-          #   runs-on: macos-11
-          #   BUILD_TOOLS: ON
-          #   BUILD_TYPE: Release
-          #   CCOMPILER: clang
-          #   CXXCOMPILER: clang++
-          #   CUCUMBER_TIMEOUT: 60000
-          #   ENABLE_ASSERTIONS: ON
-          #   ENABLE_CONAN: ON
+          - name: conan-osx-release-node-14
+            build_node_package: true
+            continue-on-error: false
+            node: 14
+            runs-on: macos-11
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Release
+            CCOMPILER: clang
+            CXXCOMPILER: clang++
+            CUCUMBER_TIMEOUT: 60000
+            ENABLE_ASSERTIONS: ON
+            ENABLE_CONAN: ON
 
-          # - name: conan-osx-release-node-16
-          #   build_node_package: true
-          #   continue-on-error: false
-          #   node: 16
-          #   runs-on: macos-11
-          #   BUILD_TOOLS: ON
-          #   BUILD_TYPE: Release
-          #   CCOMPILER: clang
-          #   CXXCOMPILER: clang++
-          #   CUCUMBER_TIMEOUT: 60000
-          #   ENABLE_ASSERTIONS: ON
-          #   ENABLE_CONAN: ON
+          - name: conan-osx-release-node-16
+            build_node_package: true
+            continue-on-error: false
+            node: 16
+            runs-on: macos-11
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Release
+            CCOMPILER: clang
+            CXXCOMPILER: clang++
+            CUCUMBER_TIMEOUT: 60000
+            ENABLE_ASSERTIONS: ON
+            ENABLE_CONAN: ON
 
-          # - name: gcc-7-release-shared
-          #   continue-on-error: false
-          #   node: 12
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TOOLS: ON
-          #   BUILD_TYPE: Release
-          #   BUILD_SHARED_LIBS: ON
-          #   CCOMPILER: gcc-7
-          #   CXXCOMPILER: g++-7
+          - name: gcc-7-release-shared
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Release
+            BUILD_SHARED_LIBS: ON
+            CCOMPILER: gcc-7
+            CXXCOMPILER: g++-7
 
-          # - name: node-12-conan-linux-release
-          #   build_node_package: true
-          #   continue-on-error: false
-          #   node: 12
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TYPE: Release
-          #   CLANG_VERSION: 6
-          #   ENABLE_GLIBC_WORKAROUND: ON
-          #   ENABLE_CONAN: ON
-          #   NODE_PACKAGE_TESTS_ONLY: ON
+          - name: node-12-conan-linux-release
+            build_node_package: true
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
+            BUILD_TYPE: Release
+            CLANG_VERSION: 6
+            ENABLE_GLIBC_WORKAROUND: ON
+            ENABLE_CONAN: ON
+            NODE_PACKAGE_TESTS_ONLY: ON
 
-          # - name: node-12-conan-linux-debug
-          #   build_node_package: true
-          #   continue-on-error: false
-          #   node: 12
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TYPE: Debug
-          #   CLANG_VERSION: 6
-          #   ENABLE_GLIBC_WORKAROUND: ON
-          #   ENABLE_CONAN: ON
-          #   NODE_PACKAGE_TESTS_ONLY: ON
+          - name: node-12-conan-linux-debug
+            build_node_package: true
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
+            BUILD_TYPE: Debug
+            CLANG_VERSION: 6
+            ENABLE_GLIBC_WORKAROUND: ON
+            ENABLE_CONAN: ON
+            NODE_PACKAGE_TESTS_ONLY: ON
 
-          # - name: node-14-conan-linux-release
-          #   build_node_package: true
-          #   continue-on-error: false
-          #   node: 14
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TYPE: Release
-          #   CLANG_VERSION: 6
-          #   ENABLE_GLIBC_WORKAROUND: ON
-          #   ENABLE_CONAN: ON
-          #   NODE_PACKAGE_TESTS_ONLY: ON
+          - name: node-14-conan-linux-release
+            build_node_package: true
+            continue-on-error: false
+            node: 14
+            runs-on: ubuntu-20.04
+            BUILD_TYPE: Release
+            CLANG_VERSION: 6
+            ENABLE_GLIBC_WORKAROUND: ON
+            ENABLE_CONAN: ON
+            NODE_PACKAGE_TESTS_ONLY: ON
 
-          # - name: node-14-conan-linux-debug
-          #   build_node_package: true
-          #   continue-on-error: false
-          #   node: 14
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TYPE: Debug
-          #   CLANG_VERSION: 6
-          #   ENABLE_GLIBC_WORKAROUND: ON
-          #   ENABLE_CONAN: ON
-          #   NODE_PACKAGE_TESTS_ONLY: ON
+          - name: node-14-conan-linux-debug
+            build_node_package: true
+            continue-on-error: false
+            node: 14
+            runs-on: ubuntu-20.04
+            BUILD_TYPE: Debug
+            CLANG_VERSION: 6
+            ENABLE_GLIBC_WORKAROUND: ON
+            ENABLE_CONAN: ON
+            NODE_PACKAGE_TESTS_ONLY: ON
 
 
-          # - name: node-16-conan-linux-release
-          #   build_node_package: true
-          #   continue-on-error: false
-          #   node: 16
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TYPE: Release
-          #   CLANG_VERSION: 6
-          #   ENABLE_GLIBC_WORKAROUND: ON
-          #   ENABLE_CONAN: ON
-          #   NODE_PACKAGE_TESTS_ONLY: ON
+          - name: node-16-conan-linux-release
+            build_node_package: true
+            continue-on-error: false
+            node: 16
+            runs-on: ubuntu-20.04
+            BUILD_TYPE: Release
+            CLANG_VERSION: 6
+            ENABLE_GLIBC_WORKAROUND: ON
+            ENABLE_CONAN: ON
+            NODE_PACKAGE_TESTS_ONLY: ON
 
-          # - name: node-16-conan-linux-debug
-          #   build_node_package: true
-          #   continue-on-error: false
-          #   node: 16
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TYPE: Debug
-          #   CLANG_VERSION: 6
-          #   ENABLE_GLIBC_WORKAROUND: ON
-          #   ENABLE_CONAN: ON
-          #   NODE_PACKAGE_TESTS_ONLY: ON
+          - name: node-16-conan-linux-debug
+            build_node_package: true
+            continue-on-error: false
+            node: 16
+            runs-on: ubuntu-20.04
+            BUILD_TYPE: Debug
+            CLANG_VERSION: 6
+            ENABLE_GLIBC_WORKAROUND: ON
+            ENABLE_CONAN: ON
+            NODE_PACKAGE_TESTS_ONLY: ON
 
-          # - name: conan-osx-release-node-latest
-          #   build_node_package: true
-          #   continue-on-error: true
-          #   node: latest
-          #   runs-on: macos-11
-          #   BUILD_TYPE: Release
-          #   CCOMPILER: clang
-          #   CXXCOMPILER: clang++
-          #   CUCUMBER_TIMEOUT: 60000
-          #   ENABLE_ASSERTIONS: ON
-          #   ENABLE_CONAN: ON
+          - name: conan-osx-release-node-latest
+            build_node_package: true
+            continue-on-error: true
+            node: latest
+            runs-on: macos-11
+            BUILD_TYPE: Release
+            CCOMPILER: clang
+            CXXCOMPILER: clang++
+            CUCUMBER_TIMEOUT: 60000
+            ENABLE_ASSERTIONS: ON
+            ENABLE_CONAN: ON
 
-          # - name: node-latest-conan-linux-release
-          #   build_node_package: true
-          #   continue-on-error: true
-          #   node: latest
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TYPE: Release
-          #   CLANG_VERSION: 6
-          #   ENABLE_GLIBC_WORKAROUND: ON
-          #   ENABLE_CONAN: ON
-          #   NODE_PACKAGE_TESTS_ONLY: ON
+          - name: node-latest-conan-linux-release
+            build_node_package: true
+            continue-on-error: true
+            node: latest
+            runs-on: ubuntu-20.04
+            BUILD_TYPE: Release
+            CLANG_VERSION: 6
+            ENABLE_GLIBC_WORKAROUND: ON
+            ENABLE_CONAN: ON
+            NODE_PACKAGE_TESTS_ONLY: ON
 
-          # - name: node-latest-conan-linux-debug
-          #   build_node_package: true
-          #   continue-on-error: true
-          #   node: latest
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TYPE: Debug
-          #   CLANG_VERSION: 6
-          #   ENABLE_GLIBC_WORKAROUND: ON
-          #   ENABLE_CONAN: ON
-          #   NODE_PACKAGE_TESTS_ONLY: ON
+          - name: node-latest-conan-linux-debug
+            build_node_package: true
+            continue-on-error: true
+            node: latest
+            runs-on: ubuntu-20.04
+            BUILD_TYPE: Debug
+            CLANG_VERSION: 6
+            ENABLE_GLIBC_WORKAROUND: ON
+            ENABLE_CONAN: ON
+            NODE_PACKAGE_TESTS_ONLY: ON
 
-          # - name: conan-osx-release-node-lts
-          #   build_node_package: true
-          #   continue-on-error: true
-          #   node: "lts/*"
-          #   runs-on: macos-11
-          #   BUILD_TYPE: Release
-          #   CCOMPILER: clang
-          #   CXXCOMPILER: clang++
-          #   CUCUMBER_TIMEOUT: 60000
-          #   ENABLE_ASSERTIONS: ON
-          #   ENABLE_CONAN: ON
+          - name: conan-osx-release-node-lts
+            build_node_package: true
+            continue-on-error: true
+            node: "lts/*"
+            runs-on: macos-11
+            BUILD_TYPE: Release
+            CCOMPILER: clang
+            CXXCOMPILER: clang++
+            CUCUMBER_TIMEOUT: 60000
+            ENABLE_ASSERTIONS: ON
+            ENABLE_CONAN: ON
 
-          # - name: node-lts-conan-linux-release
-          #   build_node_package: true
-          #   continue-on-error: true
-          #   node: "lts/*"
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TYPE: Release
-          #   CLANG_VERSION: 6
-          #   ENABLE_GLIBC_WORKAROUND: ON
-          #   ENABLE_CONAN: ON
-          #   NODE_PACKAGE_TESTS_ONLY: ON
+          - name: node-lts-conan-linux-release
+            build_node_package: true
+            continue-on-error: true
+            node: "lts/*"
+            runs-on: ubuntu-20.04
+            BUILD_TYPE: Release
+            CLANG_VERSION: 6
+            ENABLE_GLIBC_WORKAROUND: ON
+            ENABLE_CONAN: ON
+            NODE_PACKAGE_TESTS_ONLY: ON
 
-          # - name: node-lts-conan-linux-debug
-          #   build_node_package: true
-          #   continue-on-error: true
-          #   node: "lts/*"
-          #   runs-on: ubuntu-20.04
-          #   BUILD_TYPE: Debug
-          #   CLANG_VERSION: 6
-          #   ENABLE_GLIBC_WORKAROUND: ON
-          #   ENABLE_CONAN: ON
-          #   NODE_PACKAGE_TESTS_ONLY: ON
+          - name: node-lts-conan-linux-debug
+            build_node_package: true
+            continue-on-error: true
+            node: "lts/*"
+            runs-on: ubuntu-20.04
+            BUILD_TYPE: Debug
+            CLANG_VERSION: 6
+            ENABLE_GLIBC_WORKAROUND: ON
+            ENABLE_CONAN: ON
+            NODE_PACKAGE_TESTS_ONLY: ON
 
     name: ${{ matrix.name}}
     continue-on-error: ${{ matrix.continue-on-error }}
@@ -517,7 +517,7 @@ jobs:
         echo "$(${MASON} prefix ccache ${CCACHE_VERSION})/bin" >> $GITHUB_PATH
 
         # clang
-        sudo apt-get update -y && sudo apt-get install "clang++-6"
+        sudo apt-get update -y && sudo apt-get install clang++-6
         # we only enable lto for release builds
         # and therefore don't need to us ld.gold or llvm tools for linking
         # for debug builds
@@ -553,12 +553,6 @@ jobs:
         tar zxvf onetbb.tgz
         sudo cp -a oneapi-tbb-${TBB_VERSION}/lib/. /usr/local/lib/
         sudo cp -a oneapi-tbb-${TBB_VERSION}/include/. /usr/local/include/
-    - name: Check clang version
-      run: |
-        if [[ -n ${CLANG_VERSION} ]]; then
-          clang --version | grep "${CLANG_VERSION}"
-          clang++ --version | grep "${CLANG_VERSION}"
-        fi
 
     - name: Prepare build
       run: |