diff --git a/.github/scripts/codeql_buildscript.sh b/.github/scripts/codeql_buildscript.sh
index 706ff5b787..99060af8f4 100755
--- a/.github/scripts/codeql_buildscript.sh
+++ b/.github/scripts/codeql_buildscript.sh
@@ -78,26 +78,30 @@ iwasm_options_list=(
     #default
     ""
     # +classic interp
-    "-DWAMR_BUILD_FAST_INTERP=0"
-    # +llvm jit + fast jit
-    "-DWAMR_BUILD_JIT=1 -DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_FAST_JIT_DUMP=1"
+    "-DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_SIMD=0"
+    # fast jit
+    "-DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_FAST_JIT_DUMP=1 -DWAMR_BUILD_SIMD=0"
+    # +llvm jit
+    "-DWAMR_BUILD_JIT=1"
     #
     "-DWAMR_BUILD_TARGET=X86_32"
     #
     # libraries
     "-DWAMR_BUILD_LIBC_BUILTIN=0 -DWAMR_BUILD_LIBC_UVWASI=1 -DWAMR_BUILD_LIBC_EMCC=1"
-    "-DWAMR_BUILD_THREAD_MGR=1 -DWAMR_BUILD_LIB_PTHREAD=1      -DWAMR_BUILD_SHARED_MEMORY=1 -DWAMR_BUILD_LIB_PTHREAD_SEMAPHORE=1"
-    "-DWAMR_BUILD_THREAD_MGR=1 -DWAMR_BUILD_LIB_WASI_THREADS=1 -DWAMR_BUILD_SHARED_MEMORY=1 -DWAMR_BUILD_LIB_PTHREAD_SEMAPHORE=1"
+    "-DWAMR_BUILD_THREAD_MGR=1 -DWAMR_BUILD_LIB_PTHREAD=1      -DWAMR_BUILD_LIB_PTHREAD_SEMAPHORE=1"
+    "-DWAMR_BUILD_THREAD_MGR=1 -DWAMR_BUILD_LIB_WASI_THREADS=1 -DWAMR_BUILD_LIB_PTHREAD_SEMAPHORE=1"
     "-DWAMR_BUILD_WASI_NN=1 -DWAMR_BUILD_WASI_NN_LLAMACPP=1"
     #
     # Wasm specs
-    "-DWAMR_BUILD_GC=1 -DWAMR_BUILD_EXCE_HANDLING=1 -DWAMR_BUILD_STRINGREF=1 -DWAMR_STRINGREF_IMPL_SOURCE=STUB"
-    "-DWAMR_BUILD_MEMORY64=1 -DWAMR_BUILD_MULTI_MEMORY=1"
+    "-DWAMR_BUILD_GC=1 -DWAMR_BUILD_STRINGREF=1 -DWAMR_STRINGREF_IMPL_SOURCE=STUB"
+    "-DWAMR_BUILD_EXCE_HANDLING=1 -DWAMR_BUILD_AOT=0 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_SIMD=0"
+    "-DWAMR_BUILD_MEMORY64=1 -DWAMR_BUILD_MULTI_MEMORY=1 -DWAMR_BUILD_SHARED_MEMORY=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_SIMD=0 -DWAMR_BUILD_AOT=0"
     #
     # WARM features
     "-DWAMR_BUILD_MULTI_MODULE=1 -DWAMR_BUILD_MINI_LOADER=1 -DWAMR_BUILD_SHARED_HEAP=1"
     "-DWAMR_DISABLE_HW_BOUND_CHECK=1"
     "-DWAMR_CONFIGURABLE_BOUNDS_CHECKS=1"
+    "-DWAMR_BUILD_EXTENDED_CONST_EXPR=1"
     # - Debug
     "-DWAMR_BUILD_DEBUG_INTERP=1 -DWAMR_BUILD_DEBUG_AOT=1 -DWAMR_BUILD_DYNAMIC_AOT_DEBUG=1"
     # - developer options
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 6089f17a40..9c48ce4708 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -58,7 +58,7 @@ jobs:
           config-file: ./.github/codeql/codeql_config.yml
 
       - run: |
-          ./.github/scripts/codeql_buildscript.sh
+          ./.github/scripts/codeql_buildscript.sh || exit 1
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v4.31.8
@@ -102,7 +102,7 @@ jobs:
             -**:cpp/unused-local-variable
             -**:cpp/unused-static-function
             -**:cpp/unused-static-variable
-            -**:cpp/use-of-goto 
+            -**:cpp/use-of-goto
             ## Exclude rules 2. Related to special usage of APIs
             -**:cpp/alloca-in-loop
             -**:cpp/command-line-injection
@@ -120,7 +120,6 @@ jobs:
           category: "/language:${{matrix.language}}"
 
       - name: Upload CodeQL results as an artifact
-        if: success() || failure()
         uses: actions/upload-artifact@v6.0.0
         with:
           name: codeql-results
diff --git a/build-scripts/unsupported_combination.cmake b/build-scripts/unsupported_combination.cmake
index 635a20a057..50c56fc822 100644
--- a/build-scripts/unsupported_combination.cmake
+++ b/build-scripts/unsupported_combination.cmake
@@ -61,7 +61,7 @@ endfunction()
 # Below are the unsupported combinations checks
 # Please keep this list in sync with tests/unit/unsupported-features/CMakeLists.txt
 # and tests/wamr-test-suites/test_wamr.sh
-#cmake_print_variables(WAMR_BUILD_INTERP WAMR_BUILD_FAST_INTERP WAMR_BUILD_JIT)
+cmake_print_variables(WAMR_BUILD_INTERP WAMR_BUILD_FAST_INTERP WAMR_BUILD_JIT WAMR_BUILD_EXCE_HANDLING)
 
 if(WAMR_BUILD_EXCE_HANDLING EQUAL 1)
   check_aot_mode_error("Unsupported build configuration: EXCE_HANDLING + AOT")
@@ -81,10 +81,10 @@ if(WAMR_BUILD_MEMORY64 EQUAL 1)
 endif()
 
 if(WAMR_BUILD_MULTI_MEMORY EQUAL 1)
-  check_aot_mode_error("Unsupported build configuration: EXCE_HANDLING + AOT")
-  check_fast_interp_error("Unsupported build configuration: EXCE_HANDLING + FAST_INTERP")
-  check_fast_jit_error("Unsupported build configuration: EXCE_HANDLING + FAST_JIT")
-  check_llvm_jit_error("Unsupported build configuration: EXCE_HANDLING + JIT")
+  check_aot_mode_error("Unsupported build configuration: MULTI_MEMORY + AOT")
+  check_fast_interp_error("Unsupported build configuration: MULTI_MEMORY + FAST_INTERP")
+  check_fast_jit_error("Unsupported build configuration: MULTI_MEMORY + FAST_JIT")
+  check_llvm_jit_error("Unsupported build configuration: MULTI_MEMORY + JIT")
 endif()
 
 if(WAMR_BUILD_MULTI_MODULE EQUAL 1)