diff --git a/.codeqlmanifest.json b/.codeqlmanifest.json
index f3a36330c4..5fe24e4bce 100644
--- a/.codeqlmanifest.json
+++ b/.codeqlmanifest.json
@@ -2,8 +2,6 @@
   "provide": [
     "codeql/*/ql/src/qlpack.yml",
     "codeql/*/ql/lib/qlpack.yml",
-    "codeql-go/*/ql/src/qlpack.yml",
-    "codeql-go/*/ql/lib/qlpack.yml",
     "*/qlpack.yml",
     "*/customizations/qlpack.yml",
     "go/qlpack.yml",
diff --git a/README.md b/README.md
index d82f11f14d..c88606867c 100644
--- a/README.md
+++ b/README.md
@@ -3,17 +3,41 @@ GitHub's Field Team's CodeQL Custom Queries, Suites, and Configurations
 
 ## Getting Started
 
-Add the GitHub Field Team's config-file as part of Actions.
+### Field Queries
+
+To enabled and use the GitHub Field Team queries, you can easily add the following configuration file as part of Actions:
 
 ```yaml
 - name: Initialize CodeQL
-  uses: github/codeql-action/init@v1
+  uses: github/codeql-action/init@v2
   with:
     config-file: advanced-security/codeql-queries/config/codeql.yml@main
 ```
 
-### Local Development
+If you want to use any of the queries but you are using your own configuration file, please just add use statements like the following:
+
+```yaml
+name: "My Custom Configuration File"
+
+queries:
+    # Simple Query
+    - uses: advanced-security/codeql-queries/{LANGUAGE}/CWE-{CWEID}/{QUERY_NAME}.ql@main
+    # Standard Query Suite
+    - uses: advanced-security/codeql-queries/{LANGUAGE}/suites/codeql-{LANGUAGE}.qls@main
+    # Audit queries
+    - uses: advanced-security/codeql-queries/{LANGUAGE}/suites/codeql-{LANGUAGE}-audit.qls@main
+```
+
+*Note: Referencing the queries directly like this will cause an query compile step and will slow down your analysis*
 
-```bash
-git clone --recursive https://github.com/advanced-security/codeql-queries.git && code .
+### Field Audit / Debugging Queries
+
+To enable and use the audit queries from the GitHub Field Security team, you can add the following configuration file to your Action:
+
+```yaml
+- name: Initialize CodeQL
+  uses: github/codeql-action/init@v2
+  with:
+    config-file: advanced-security/codeql-queries/config/codeql-audit.yml@main
 ```
+
diff --git a/codeql-queries.code-workspace b/codeql-queries.code-workspace
index b9ba38bd36..50deca9096 100644
--- a/codeql-queries.code-workspace
+++ b/codeql-queries.code-workspace
@@ -13,7 +13,7 @@
             "path": "go"
         },
         {
-            "name": "Queries - Java",
+            "name": "Queries - Java/Kotlin",
             "path": "java"
         },
         {
@@ -28,10 +28,18 @@
             "name": "Queries - Ruby",
             "path": "ruby"
         },
+        {
+            "name": "Queries - Swift",
+            "path": "swift"
+        },
         {
             "name": "Tests",
             "path": "tests"
         },
+        {
+            "name": "Config",
+            "path": "config"
+        },
         {
             "name": "CodeQL - Query Languages",
             "path": "codeql"
@@ -45,5 +53,31 @@
         "codeQL.runningQueries.debug": true,
         "editor.formatOnSave": true,
         "editor.formatOnPaste": true
-    }
+    },
+    "tasks": {
+        "version": "2.0.0",
+        "tasks": [
+            {
+                "label": "Generate Coverage Reports",
+                "type": "shell",
+                "command": "python3 ./.github/scripts/generate-coverage.py -l ${input:language} --disable-cache",
+                "problemMatcher": [],
+                "options": {
+                    "cwd": ".."
+                },
+                "group": {
+                    "kind": "build",
+                    "isDefault": true
+                }
+            }
+        ],
+        "inputs": [
+            {
+                "id": "language",
+                "description": "Language",
+                "default": "all",
+                "type": "promptString"
+            }
+        ]
+    },
 }
\ No newline at end of file
diff --git a/csharp/.data/queries.json b/csharp/.data/queries.json
index 5173c63b6d..bcadfcbb4e 100644
--- a/csharp/.data/queries.json
+++ b/csharp/.data/queries.json
@@ -49,6 +49,7 @@
     "codeql/csharp/ql/src/Diagnostics/ExtractorMessage.ql",
     "codeql/csharp/ql/src/Metrics/Summaries/LinesOfCode.ql",
     "codeql/csharp/ql/src/Telemetry/ExternalLibraryUsage.ql",
+    "codeql/csharp/ql/src/Telemetry/SupportedExternalApis.ql",
     "codeql/csharp/ql/src/Telemetry/SupportedExternalSinks.ql",
     "codeql/csharp/ql/src/Telemetry/SupportedExternalSources.ql",
     "codeql/csharp/ql/src/Telemetry/SupportedExternalTaint.ql",
@@ -121,6 +122,7 @@
     "codeql/csharp/ql/src/Diagnostics/ExtractorMessage.ql",
     "codeql/csharp/ql/src/Metrics/Summaries/LinesOfCode.ql",
     "codeql/csharp/ql/src/Telemetry/ExternalLibraryUsage.ql",
+    "codeql/csharp/ql/src/Telemetry/SupportedExternalApis.ql",
     "codeql/csharp/ql/src/Telemetry/SupportedExternalSinks.ql",
     "codeql/csharp/ql/src/Telemetry/SupportedExternalSources.ql",
     "codeql/csharp/ql/src/Telemetry/SupportedExternalTaint.ql",
@@ -294,6 +296,7 @@
     "codeql/csharp/ql/src/Diagnostics/ExtractorMessage.ql",
     "codeql/csharp/ql/src/Metrics/Summaries/LinesOfCode.ql",
     "codeql/csharp/ql/src/Telemetry/ExternalLibraryUsage.ql",
+    "codeql/csharp/ql/src/Telemetry/SupportedExternalApis.ql",
     "codeql/csharp/ql/src/Telemetry/SupportedExternalSinks.ql",
     "codeql/csharp/ql/src/Telemetry/SupportedExternalSources.ql",
     "codeql/csharp/ql/src/Telemetry/SupportedExternalTaint.ql",
@@ -366,6 +369,7 @@
     "codeql/csharp/ql/src/Diagnostics/ExtractorMessage.ql",
     "codeql/csharp/ql/src/Metrics/Summaries/LinesOfCode.ql",
     "codeql/csharp/ql/src/Telemetry/ExternalLibraryUsage.ql",
+    "codeql/csharp/ql/src/Telemetry/SupportedExternalApis.ql",
     "codeql/csharp/ql/src/Telemetry/SupportedExternalSinks.ql",
     "codeql/csharp/ql/src/Telemetry/SupportedExternalSources.ql",
     "codeql/csharp/ql/src/Telemetry/SupportedExternalTaint.ql",
diff --git a/csharp/README.md b/csharp/README.md
index 97b0492a02..8e8e96c1ea 100644
--- a/csharp/README.md
+++ b/csharp/README.md
@@ -4,10 +4,10 @@
 <!-- AUTOMATION-SUITES -->
 | Name | Queries Count | Description | Path |
 | :--- | :---- | :--- | :--- |
-| `default` | 53 | Default Query Suite | `codeql/csharp/ql/src/codeql-suites/code-scanning` |
-| `extended` | 70 | Security Extended Suite | `codeql/csharp/ql/src/codeql-suites/security-extended` |
-| `quality` | 171 | Security and Quality Extended Suite | `codeql/csharp/ql/src/codeql-suites/security-and-quality` |
-| `super-extended` | 80 | Security Extended with Experimental and Custom Queries Suite | `advanced-security/codeql-queries/csharp/suites/codeql-csharp.qls@main` |
+| `default` | 54 | Default Query Suite | `codeql/csharp/ql/src/codeql-suites/code-scanning` |
+| `extended` | 71 | Security Extended Suite | `codeql/csharp/ql/src/codeql-suites/security-extended` |
+| `quality` | 172 | Security and Quality Extended Suite | `codeql/csharp/ql/src/codeql-suites/security-and-quality` |
+| `super-extended` | 81 | Security Extended with Experimental and Custom Queries Suite | `advanced-security/codeql-queries/csharp/suites/codeql-csharp.qls@main` |
 
 
 <!-- AUTOMATION-SUITES -->
\ No newline at end of file
diff --git a/java/.data/queries.json b/java/.data/queries.json
index 5bea7d51ff..82c74c15fc 100644
--- a/java/.data/queries.json
+++ b/java/.data/queries.json
@@ -29,6 +29,7 @@
     "codeql/java/ql/src/Security/CWE/CWE-295/InsecureTrustManager.ql",
     "codeql/java/ql/src/Security/CWE/CWE-297/UnsafeHostnameVerification.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/CleartextStorageCookie.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-326/InsufficientKeySize.ql",
     "codeql/java/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.ql",
     "codeql/java/ql/src/Security/CWE/CWE-335/PredictableSeed.ql",
     "codeql/java/ql/src/Security/CWE/CWE-338/JHipsterGeneratedPRNG.ql",
@@ -47,6 +48,7 @@
     "codeql/java/ql/src/Security/CWE/CWE-681/NumericCastTainted.ql",
     "codeql/java/ql/src/Security/CWE/CWE-730/PolynomialReDoS.ql",
     "codeql/java/ql/src/Security/CWE/CWE-730/ReDoS.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-730/RegexInjection.ql",
     "codeql/java/ql/src/Security/CWE/CWE-732/ReadingFromWorldWritableFile.ql",
     "codeql/java/ql/src/Security/CWE/CWE-780/RsaWithoutOaep.ql",
     "codeql/java/ql/src/Security/CWE/CWE-807/TaintedPermissionsCheck.ql",
@@ -62,6 +64,8 @@
     "codeql/java/ql/src/Diagnostics/SuccessfullyExtractedFiles.ql",
     "codeql/java/ql/src/Metrics/Summaries/LinesOfCode.ql",
     "codeql/java/ql/src/Telemetry/ExternalLibraryUsage.ql",
+    "codeql/java/ql/src/Telemetry/ExtractorInformation.ql",
+    "codeql/java/ql/src/Telemetry/SupportedExternalApis.ql",
     "codeql/java/ql/src/Telemetry/SupportedExternalSinks.ql",
     "codeql/java/ql/src/Telemetry/SupportedExternalSources.ql",
     "codeql/java/ql/src/Telemetry/SupportedExternalTaint.ql",
@@ -98,6 +102,7 @@
     "codeql/java/ql/src/Security/CWE/CWE-297/UnsafeHostnameVerification.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/AllowBackupAttributeEnabled.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/CleartextStorageCookie.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-326/InsufficientKeySize.ql",
     "codeql/java/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.ql",
     "codeql/java/ql/src/Security/CWE/CWE-335/PredictableSeed.ql",
     "codeql/java/ql/src/Security/CWE/CWE-338/JHipsterGeneratedPRNG.ql",
@@ -116,6 +121,7 @@
     "codeql/java/ql/src/Security/CWE/CWE-681/NumericCastTainted.ql",
     "codeql/java/ql/src/Security/CWE/CWE-730/PolynomialReDoS.ql",
     "codeql/java/ql/src/Security/CWE/CWE-730/ReDoS.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-730/RegexInjection.ql",
     "codeql/java/ql/src/Security/CWE/CWE-732/ReadingFromWorldWritableFile.ql",
     "codeql/java/ql/src/Security/CWE/CWE-780/RsaWithoutOaep.ql",
     "codeql/java/ql/src/Security/CWE/CWE-807/TaintedPermissionsCheck.ql",
@@ -129,15 +135,20 @@
     "codeql/java/ql/src/Likely Bugs/Concurrency/UnreleasedLock.ql",
     "codeql/java/ql/src/Security/CWE/CWE-023/PartialPathTraversal.ql",
     "codeql/java/ql/src/Security/CWE/CWE-078/ExecRelative.ql",
-    "codeql/java/ql/src/Security/CWE/CWE-089/SqlUnescaped.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-079/AndroidWebViewAddJavascriptInterface.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-079/AndroidWebViewSettingsEnabledJavaScript.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-089/SqlConcatenated.ql",
     "codeql/java/ql/src/Security/CWE/CWE-117/LogInjection.ql",
     "codeql/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayConstruction.ql",
     "codeql/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayIndex.ql",
     "codeql/java/ql/src/Security/CWE/CWE-190/ArithmeticTainted.ql",
     "codeql/java/ql/src/Security/CWE/CWE-190/ArithmeticUncontrolled.ql",
     "codeql/java/ql/src/Security/CWE/CWE-190/ComparisonWithWiderType.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsAllowsContentAccess.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsFileAccess.ql",
     "codeql/java/ql/src/Security/CWE/CWE-200/TempDirLocalInformationDisclosure.ql",
     "codeql/java/ql/src/Security/CWE/CWE-273/UnsafeCertTrust.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-295/AndroidMissingCertificatePinning.ql",
     "codeql/java/ql/src/Security/CWE/CWE-297/InsecureJavaMail.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/CleartextStorageAndroidDatabase.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/CleartextStorageAndroidFilesystem.ql",
@@ -147,6 +158,7 @@
     "codeql/java/ql/src/Security/CWE/CWE-367/TOCTOURace.ql",
     "codeql/java/ql/src/Security/CWE/CWE-421/SocketAuthRace.ql",
     "codeql/java/ql/src/Security/CWE/CWE-522/InsecureBasicAuth.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-524/SensitiveKeyboardCache.ql",
     "codeql/java/ql/src/Security/CWE/CWE-532/SensitiveInfoLog.ql",
     "codeql/java/ql/src/Security/CWE/CWE-676/PotentiallyDangerousFunction.ql",
     "codeql/java/ql/src/Security/CWE/CWE-749/UnsafeAndroidAccess.ql",
@@ -155,11 +167,14 @@
     "codeql/java/ql/src/Security/CWE/CWE-835/InfiniteLoop.ql",
     "codeql/java/ql/src/Security/CWE/CWE-926/ContentProviderIncompletePermissions.ql",
     "codeql/java/ql/src/Security/CWE/CWE-927/SensitiveCommunication.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-927/SensitiveResultReceiver.ql",
     "codeql/java/ql/src/Diagnostics/ExtractionErrors.ql",
     "codeql/java/ql/src/Diagnostics/ExtractionWarnings.ql",
     "codeql/java/ql/src/Diagnostics/SuccessfullyExtractedFiles.ql",
     "codeql/java/ql/src/Metrics/Summaries/LinesOfCode.ql",
     "codeql/java/ql/src/Telemetry/ExternalLibraryUsage.ql",
+    "codeql/java/ql/src/Telemetry/ExtractorInformation.ql",
+    "codeql/java/ql/src/Telemetry/SupportedExternalApis.ql",
     "codeql/java/ql/src/Telemetry/SupportedExternalSinks.ql",
     "codeql/java/ql/src/Telemetry/SupportedExternalSources.ql",
     "codeql/java/ql/src/Telemetry/SupportedExternalTaint.ql",
@@ -196,6 +211,7 @@
     "codeql/java/ql/src/Security/CWE/CWE-297/UnsafeHostnameVerification.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/AllowBackupAttributeEnabled.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/CleartextStorageCookie.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-326/InsufficientKeySize.ql",
     "codeql/java/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.ql",
     "codeql/java/ql/src/Security/CWE/CWE-335/PredictableSeed.ql",
     "codeql/java/ql/src/Security/CWE/CWE-338/JHipsterGeneratedPRNG.ql",
@@ -214,6 +230,7 @@
     "codeql/java/ql/src/Security/CWE/CWE-681/NumericCastTainted.ql",
     "codeql/java/ql/src/Security/CWE/CWE-730/PolynomialReDoS.ql",
     "codeql/java/ql/src/Security/CWE/CWE-730/ReDoS.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-730/RegexInjection.ql",
     "codeql/java/ql/src/Security/CWE/CWE-732/ReadingFromWorldWritableFile.ql",
     "codeql/java/ql/src/Security/CWE/CWE-780/RsaWithoutOaep.ql",
     "codeql/java/ql/src/Security/CWE/CWE-807/TaintedPermissionsCheck.ql",
@@ -227,15 +244,20 @@
     "codeql/java/ql/src/Likely Bugs/Concurrency/UnreleasedLock.ql",
     "codeql/java/ql/src/Security/CWE/CWE-023/PartialPathTraversal.ql",
     "codeql/java/ql/src/Security/CWE/CWE-078/ExecRelative.ql",
-    "codeql/java/ql/src/Security/CWE/CWE-089/SqlUnescaped.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-079/AndroidWebViewAddJavascriptInterface.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-079/AndroidWebViewSettingsEnabledJavaScript.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-089/SqlConcatenated.ql",
     "codeql/java/ql/src/Security/CWE/CWE-117/LogInjection.ql",
     "codeql/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayConstruction.ql",
     "codeql/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayIndex.ql",
     "codeql/java/ql/src/Security/CWE/CWE-190/ArithmeticTainted.ql",
     "codeql/java/ql/src/Security/CWE/CWE-190/ArithmeticUncontrolled.ql",
     "codeql/java/ql/src/Security/CWE/CWE-190/ComparisonWithWiderType.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsAllowsContentAccess.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsFileAccess.ql",
     "codeql/java/ql/src/Security/CWE/CWE-200/TempDirLocalInformationDisclosure.ql",
     "codeql/java/ql/src/Security/CWE/CWE-273/UnsafeCertTrust.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-295/AndroidMissingCertificatePinning.ql",
     "codeql/java/ql/src/Security/CWE/CWE-297/InsecureJavaMail.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/CleartextStorageAndroidDatabase.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/CleartextStorageAndroidFilesystem.ql",
@@ -245,6 +267,7 @@
     "codeql/java/ql/src/Security/CWE/CWE-367/TOCTOURace.ql",
     "codeql/java/ql/src/Security/CWE/CWE-421/SocketAuthRace.ql",
     "codeql/java/ql/src/Security/CWE/CWE-522/InsecureBasicAuth.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-524/SensitiveKeyboardCache.ql",
     "codeql/java/ql/src/Security/CWE/CWE-532/SensitiveInfoLog.ql",
     "codeql/java/ql/src/Security/CWE/CWE-676/PotentiallyDangerousFunction.ql",
     "codeql/java/ql/src/Security/CWE/CWE-749/UnsafeAndroidAccess.ql",
@@ -253,11 +276,14 @@
     "codeql/java/ql/src/Security/CWE/CWE-835/InfiniteLoop.ql",
     "codeql/java/ql/src/Security/CWE/CWE-926/ContentProviderIncompletePermissions.ql",
     "codeql/java/ql/src/Security/CWE/CWE-927/SensitiveCommunication.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-927/SensitiveResultReceiver.ql",
     "codeql/java/ql/src/Diagnostics/ExtractionErrors.ql",
     "codeql/java/ql/src/Diagnostics/ExtractionWarnings.ql",
     "codeql/java/ql/src/Diagnostics/SuccessfullyExtractedFiles.ql",
     "codeql/java/ql/src/Metrics/Summaries/LinesOfCode.ql",
     "codeql/java/ql/src/Telemetry/ExternalLibraryUsage.ql",
+    "codeql/java/ql/src/Telemetry/ExtractorInformation.ql",
+    "codeql/java/ql/src/Telemetry/SupportedExternalApis.ql",
     "codeql/java/ql/src/Telemetry/SupportedExternalSinks.ql",
     "codeql/java/ql/src/Telemetry/SupportedExternalSources.ql",
     "codeql/java/ql/src/Telemetry/SupportedExternalTaint.ql",
@@ -367,6 +393,7 @@
     "codeql/java/ql/src/Security/CWE/CWE-297/UnsafeHostnameVerification.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/AllowBackupAttributeEnabled.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/CleartextStorageCookie.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-326/InsufficientKeySize.ql",
     "codeql/java/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.ql",
     "codeql/java/ql/src/Security/CWE/CWE-335/PredictableSeed.ql",
     "codeql/java/ql/src/Security/CWE/CWE-338/JHipsterGeneratedPRNG.ql",
@@ -385,6 +412,7 @@
     "codeql/java/ql/src/Security/CWE/CWE-681/NumericCastTainted.ql",
     "codeql/java/ql/src/Security/CWE/CWE-730/PolynomialReDoS.ql",
     "codeql/java/ql/src/Security/CWE/CWE-730/ReDoS.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-730/RegexInjection.ql",
     "codeql/java/ql/src/Security/CWE/CWE-732/ReadingFromWorldWritableFile.ql",
     "codeql/java/ql/src/Security/CWE/CWE-780/RsaWithoutOaep.ql",
     "codeql/java/ql/src/Security/CWE/CWE-807/TaintedPermissionsCheck.ql",
@@ -452,15 +480,20 @@
     "codeql/java/ql/src/Likely Bugs/Termination/SpinOnField.ql",
     "codeql/java/ql/src/Security/CWE/CWE-023/PartialPathTraversal.ql",
     "codeql/java/ql/src/Security/CWE/CWE-078/ExecRelative.ql",
-    "codeql/java/ql/src/Security/CWE/CWE-089/SqlUnescaped.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-079/AndroidWebViewAddJavascriptInterface.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-079/AndroidWebViewSettingsEnabledJavaScript.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-089/SqlConcatenated.ql",
     "codeql/java/ql/src/Security/CWE/CWE-117/LogInjection.ql",
     "codeql/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayConstruction.ql",
     "codeql/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayIndex.ql",
     "codeql/java/ql/src/Security/CWE/CWE-190/ArithmeticTainted.ql",
     "codeql/java/ql/src/Security/CWE/CWE-190/ArithmeticUncontrolled.ql",
     "codeql/java/ql/src/Security/CWE/CWE-190/ComparisonWithWiderType.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsAllowsContentAccess.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsFileAccess.ql",
     "codeql/java/ql/src/Security/CWE/CWE-200/TempDirLocalInformationDisclosure.ql",
     "codeql/java/ql/src/Security/CWE/CWE-273/UnsafeCertTrust.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-295/AndroidMissingCertificatePinning.ql",
     "codeql/java/ql/src/Security/CWE/CWE-297/InsecureJavaMail.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/CleartextStorageAndroidDatabase.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/CleartextStorageAndroidFilesystem.ql",
@@ -470,6 +503,7 @@
     "codeql/java/ql/src/Security/CWE/CWE-367/TOCTOURace.ql",
     "codeql/java/ql/src/Security/CWE/CWE-421/SocketAuthRace.ql",
     "codeql/java/ql/src/Security/CWE/CWE-522/InsecureBasicAuth.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-524/SensitiveKeyboardCache.ql",
     "codeql/java/ql/src/Security/CWE/CWE-532/SensitiveInfoLog.ql",
     "codeql/java/ql/src/Security/CWE/CWE-676/PotentiallyDangerousFunction.ql",
     "codeql/java/ql/src/Security/CWE/CWE-749/UnsafeAndroidAccess.ql",
@@ -478,6 +512,7 @@
     "codeql/java/ql/src/Security/CWE/CWE-835/InfiniteLoop.ql",
     "codeql/java/ql/src/Security/CWE/CWE-926/ContentProviderIncompletePermissions.ql",
     "codeql/java/ql/src/Security/CWE/CWE-927/SensitiveCommunication.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-927/SensitiveResultReceiver.ql",
     "codeql/java/ql/src/Violations of Best Practice/Dead Code/CreatesEmptyZip.ql",
     "codeql/java/ql/src/Violations of Best Practice/Implementation Hiding/GetClassGetResource.ql",
     "codeql/java/ql/src/Violations of Best Practice/Naming Conventions/FieldMasksSuperField.ql",
@@ -488,6 +523,8 @@
     "codeql/java/ql/src/Diagnostics/SuccessfullyExtractedFiles.ql",
     "codeql/java/ql/src/Metrics/Summaries/LinesOfCode.ql",
     "codeql/java/ql/src/Telemetry/ExternalLibraryUsage.ql",
+    "codeql/java/ql/src/Telemetry/ExtractorInformation.ql",
+    "codeql/java/ql/src/Telemetry/SupportedExternalApis.ql",
     "codeql/java/ql/src/Telemetry/SupportedExternalSinks.ql",
     "codeql/java/ql/src/Telemetry/SupportedExternalSources.ql",
     "codeql/java/ql/src/Telemetry/SupportedExternalTaint.ql",
@@ -531,6 +568,7 @@
     "codeql/java/ql/src/Security/CWE/CWE-297/UnsafeHostnameVerification.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/AllowBackupAttributeEnabled.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/CleartextStorageCookie.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-326/InsufficientKeySize.ql",
     "codeql/java/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.ql",
     "codeql/java/ql/src/Security/CWE/CWE-335/PredictableSeed.ql",
     "codeql/java/ql/src/Security/CWE/CWE-338/JHipsterGeneratedPRNG.ql",
@@ -549,6 +587,7 @@
     "codeql/java/ql/src/Security/CWE/CWE-681/NumericCastTainted.ql",
     "codeql/java/ql/src/Security/CWE/CWE-730/PolynomialReDoS.ql",
     "codeql/java/ql/src/Security/CWE/CWE-730/ReDoS.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-730/RegexInjection.ql",
     "codeql/java/ql/src/Security/CWE/CWE-732/ReadingFromWorldWritableFile.ql",
     "codeql/java/ql/src/Security/CWE/CWE-780/RsaWithoutOaep.ql",
     "codeql/java/ql/src/Security/CWE/CWE-807/TaintedPermissionsCheck.ql",
@@ -562,15 +601,20 @@
     "codeql/java/ql/src/Likely Bugs/Concurrency/UnreleasedLock.ql",
     "codeql/java/ql/src/Security/CWE/CWE-023/PartialPathTraversal.ql",
     "codeql/java/ql/src/Security/CWE/CWE-078/ExecRelative.ql",
-    "codeql/java/ql/src/Security/CWE/CWE-089/SqlUnescaped.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-079/AndroidWebViewAddJavascriptInterface.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-079/AndroidWebViewSettingsEnabledJavaScript.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-089/SqlConcatenated.ql",
     "codeql/java/ql/src/Security/CWE/CWE-117/LogInjection.ql",
     "codeql/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayConstruction.ql",
     "codeql/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayIndex.ql",
     "codeql/java/ql/src/Security/CWE/CWE-190/ArithmeticTainted.ql",
     "codeql/java/ql/src/Security/CWE/CWE-190/ArithmeticUncontrolled.ql",
     "codeql/java/ql/src/Security/CWE/CWE-190/ComparisonWithWiderType.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsAllowsContentAccess.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsFileAccess.ql",
     "codeql/java/ql/src/Security/CWE/CWE-200/TempDirLocalInformationDisclosure.ql",
     "codeql/java/ql/src/Security/CWE/CWE-273/UnsafeCertTrust.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-295/AndroidMissingCertificatePinning.ql",
     "codeql/java/ql/src/Security/CWE/CWE-297/InsecureJavaMail.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/CleartextStorageAndroidDatabase.ql",
     "codeql/java/ql/src/Security/CWE/CWE-312/CleartextStorageAndroidFilesystem.ql",
@@ -580,6 +624,7 @@
     "codeql/java/ql/src/Security/CWE/CWE-367/TOCTOURace.ql",
     "codeql/java/ql/src/Security/CWE/CWE-421/SocketAuthRace.ql",
     "codeql/java/ql/src/Security/CWE/CWE-522/InsecureBasicAuth.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-524/SensitiveKeyboardCache.ql",
     "codeql/java/ql/src/Security/CWE/CWE-532/SensitiveInfoLog.ql",
     "codeql/java/ql/src/Security/CWE/CWE-676/PotentiallyDangerousFunction.ql",
     "codeql/java/ql/src/Security/CWE/CWE-749/UnsafeAndroidAccess.ql",
@@ -588,11 +633,14 @@
     "codeql/java/ql/src/Security/CWE/CWE-835/InfiniteLoop.ql",
     "codeql/java/ql/src/Security/CWE/CWE-926/ContentProviderIncompletePermissions.ql",
     "codeql/java/ql/src/Security/CWE/CWE-927/SensitiveCommunication.ql",
+    "codeql/java/ql/src/Security/CWE/CWE-927/SensitiveResultReceiver.ql",
     "codeql/java/ql/src/Diagnostics/ExtractionErrors.ql",
     "codeql/java/ql/src/Diagnostics/ExtractionWarnings.ql",
     "codeql/java/ql/src/Diagnostics/SuccessfullyExtractedFiles.ql",
     "codeql/java/ql/src/Metrics/Summaries/LinesOfCode.ql",
     "codeql/java/ql/src/Telemetry/ExternalLibraryUsage.ql",
+    "codeql/java/ql/src/Telemetry/ExtractorInformation.ql",
+    "codeql/java/ql/src/Telemetry/SupportedExternalApis.ql",
     "codeql/java/ql/src/Telemetry/SupportedExternalSinks.ql",
     "codeql/java/ql/src/Telemetry/SupportedExternalSources.ql",
     "codeql/java/ql/src/Telemetry/SupportedExternalTaint.ql",
@@ -608,7 +656,6 @@
     "codeql/java/ql/src/experimental/Security/CWE/CWE-094/SpringViewManipulation.ql",
     "codeql/java/ql/src/experimental/Security/CWE/CWE-1004/InsecureTomcatConfig.ql",
     "codeql/java/ql/src/experimental/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql",
-    "codeql/java/ql/src/experimental/Security/CWE/CWE-326/InsufficientKeySize.ql",
     "codeql/java/ql/src/experimental/Security/CWE/CWE-327/UnsafeTlsVersion.ql",
     "codeql/java/ql/src/experimental/Security/CWE/CWE-346/UnvalidatedCors.ql",
     "codeql/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjection.ql",
diff --git a/java/README.md b/java/README.md
index 4ab524b5b8..a6924c27a2 100644
--- a/java/README.md
+++ b/java/README.md
@@ -21,11 +21,11 @@
 <!-- AUTOMATION-SUITES -->
 | Name | Queries Count | Description | Path |
 | :--- | :---- | :--- | :--- |
-| `default` | 66 | Default Query Suite | `codeql/java/ql/src/codeql-suites/code-scanning` |
-| `extended` | 96 | Security Extended Suite | `codeql/java/ql/src/codeql-suites/security-extended` |
-| `quality` | 216 | Security and Quality Extended Suite | `codeql/java/ql/src/codeql-suites/security-and-quality` |
-| `local-variants` | 108 | Security Extended with local variants enabled | `advanced-security/codeql-queries/java/suites/codeql-java-local.qls@main` |
-| `super-extended` | 132 | Security Extended with Experimental and Custom Queries Suite | `advanced-security/codeql-queries/java/suites/codeql-java.qls@main` |
+| `default` | 70 | Default Query Suite | `codeql/java/ql/src/codeql-suites/code-scanning` |
+| `extended` | 107 | Security Extended Suite | `codeql/java/ql/src/codeql-suites/security-extended` |
+| `quality` | 227 | Security and Quality Extended Suite | `codeql/java/ql/src/codeql-suites/security-and-quality` |
+| `local-variants` | 119 | Security Extended with local variants enabled | `advanced-security/codeql-queries/java/suites/codeql-java-local.qls@main` |
+| `super-extended` | 142 | Security Extended with Experimental and Custom Queries Suite | `advanced-security/codeql-queries/java/suites/codeql-java.qls@main` |
 
 
 <!-- AUTOMATION-SUITES -->
diff --git a/javascript/.data/queries.json b/javascript/.data/queries.json
index ab91972290..91b16dc0ad 100644
--- a/javascript/.data/queries.json
+++ b/javascript/.data/queries.json
@@ -26,6 +26,7 @@
     "codeql/javascript/ql/src/Security/CWE-022/ZipSlip.ql",
     "codeql/javascript/ql/src/Security/CWE-073/TemplateObjectInjection.ql",
     "codeql/javascript/ql/src/Security/CWE-078/CommandInjection.ql",
+    "codeql/javascript/ql/src/Security/CWE-078/SecondOrderCommandInjection.ql",
     "codeql/javascript/ql/src/Security/CWE-078/ShellCommandInjectionFromEnvironment.ql",
     "codeql/javascript/ql/src/Security/CWE-078/UnsafeShellCommandConstruction.ql",
     "codeql/javascript/ql/src/Security/CWE-078/UselessUseOfCat.ql",
@@ -115,6 +116,7 @@
     "codeql/javascript/ql/src/Security/CWE-022/ZipSlip.ql",
     "codeql/javascript/ql/src/Security/CWE-073/TemplateObjectInjection.ql",
     "codeql/javascript/ql/src/Security/CWE-078/CommandInjection.ql",
+    "codeql/javascript/ql/src/Security/CWE-078/SecondOrderCommandInjection.ql",
     "codeql/javascript/ql/src/Security/CWE-078/ShellCommandInjectionFromEnvironment.ql",
     "codeql/javascript/ql/src/Security/CWE-078/UnsafeShellCommandConstruction.ql",
     "codeql/javascript/ql/src/Security/CWE-078/UselessUseOfCat.ql",
@@ -306,6 +308,7 @@
     "codeql/javascript/ql/src/Security/CWE-022/ZipSlip.ql",
     "codeql/javascript/ql/src/Security/CWE-073/TemplateObjectInjection.ql",
     "codeql/javascript/ql/src/Security/CWE-078/CommandInjection.ql",
+    "codeql/javascript/ql/src/Security/CWE-078/SecondOrderCommandInjection.ql",
     "codeql/javascript/ql/src/Security/CWE-078/ShellCommandInjectionFromEnvironment.ql",
     "codeql/javascript/ql/src/Security/CWE-078/UnsafeShellCommandConstruction.ql",
     "codeql/javascript/ql/src/Security/CWE-078/UselessUseOfCat.ql",
@@ -427,6 +430,7 @@
     "codeql/javascript/ql/src/Security/CWE-022/ZipSlip.ql",
     "codeql/javascript/ql/src/Security/CWE-073/TemplateObjectInjection.ql",
     "codeql/javascript/ql/src/Security/CWE-078/CommandInjection.ql",
+    "codeql/javascript/ql/src/Security/CWE-078/SecondOrderCommandInjection.ql",
     "codeql/javascript/ql/src/Security/CWE-078/ShellCommandInjectionFromEnvironment.ql",
     "codeql/javascript/ql/src/Security/CWE-078/UnsafeShellCommandConstruction.ql",
     "codeql/javascript/ql/src/Security/CWE-078/UselessUseOfCat.ql",
@@ -513,10 +517,25 @@
     "codeql/javascript/ql/src/Summary/LinesOfCode.ql",
     "codeql/javascript/ql/src/Summary/LinesOfUserCode.ql",
     "codeql/javascript/ql/src/experimental/Security/CWE-094/UntrustedCheckout.ql",
+    "codeql/javascript/ql/src/experimental/Security/CWE-340/TokenBuiltFromUUID.ql",
     "codeql/javascript/ql/src/experimental/Security/CWE-918/SSRF.ql",
     "codeql/javascript/ql/src/experimental/StandardLibrary/MultipleArgumentsToSetConstructor.ql",
-    "codeql/javascript/ql/src/experimental/Summaries/ExtractFlowStepSummaries.ql",
-    "codeql/javascript/ql/src/experimental/Summaries/ExtractSinkSummaries.ql",
-    "codeql/javascript/ql/src/experimental/Summaries/ExtractSourceSummaries.ql"
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-020/UntrustedDataToExternalAPI.ql",
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-078/CommandInjection.ql",
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-079/Xss.ql",
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-089/SqlInjection.ql",
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-094/CodeInjection.ql",
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-117/LogInjection.ql",
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-134/TaintedFormatString.ql",
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-346/CorsMisconfigurationForCredentials.ql",
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-400/RemotePropertyInjection.ql",
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-502/UnsafeDeserialization.ql",
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-611/Xxe.ql",
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-643/XpathInjection.ql",
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-730/RegExpInjection.ql",
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-770/ResourceExhaustion.ql",
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-776/XmlBomb.ql",
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-807/ConditionalBypass.ql",
+    "codeql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-915/PrototypePollutingAssignment.ql"
   ]
 }
\ No newline at end of file
diff --git a/javascript/README.md b/javascript/README.md
index d2bc6b1613..a7949c132a 100644
--- a/javascript/README.md
+++ b/javascript/README.md
@@ -4,11 +4,13 @@
 <!-- AUTOMATION-SUITES -->
 | Name | Queries Count | Description | Path |
 | :--- | :---- | :--- | :--- |
-| `default` | 87 | Default Query Suite | `codeql/javascript/ql/src/codeql-suites/code-scanning` |
-| `extended` | 104 | Security Extended Suite | `codeql/javascript/ql/src/codeql-suites/security-extended` |
-| `quality` | 202 | Security and Quality Extended Suite | `codeql/javascript/ql/src/codeql-suites/security-and-quality` |
-| `super-extended` | 112 | Security Extended with Experimental and Custom Queries Suite | `advanced-security/codeql-queries/javascript/suites/codeql-javascript.qls@main` |
+| `default` | 88 | Default Query Suite | `codeql/javascript/ql/src/codeql-suites/code-scanning` |
+| `extended` | 105 | Security Extended Suite | `codeql/javascript/ql/src/codeql-suites/security-extended` |
+| `quality` | 203 | Security and Quality Extended Suite | `codeql/javascript/ql/src/codeql-suites/security-and-quality` |
+| `super-extended` | 128 | Security Extended with Experimental and Custom Queries Suite | `advanced-security/codeql-queries/javascript/suites/codeql-javascript.qls@main` |
 | `audit` | 5 | Security Audit Query Suite | `advanced-security/codeql-queries/javascript/suites/codeql-javascript-audit.qls@main` |
+
+
 <!-- AUTOMATION-SUITES -->
 
 ## Queries
diff --git a/javascript/suites/codeql-javascript.qls b/javascript/suites/codeql-javascript.qls
index 7e3ddeb163..e8044d905a 100644
--- a/javascript/suites/codeql-javascript.qls
+++ b/javascript/suites/codeql-javascript.qls
@@ -1,3 +1,4 @@
+# https://codeql.github.com/docs/codeql-cli/creating-codeql-query-suites/
 
 - description: "GitHub's Field Team JavaScript/TypeScript extended Suite"
 
diff --git a/python/.data/queries.json b/python/.data/queries.json
index 134b4369a9..dd4e989a12 100644
--- a/python/.data/queries.json
+++ b/python/.data/queries.json
@@ -377,6 +377,7 @@
     "codeql/python/ql/src/experimental/Classes/NamingConventionsClasses.ql",
     "codeql/python/ql/src/experimental/Functions/NamingConventionsFunctions.ql",
     "codeql/python/ql/src/experimental/Security/CWE-022/ZipSlip.ql",
+    "codeql/python/ql/src/experimental/Security/CWE-022bis/TarSlipImprov.ql",
     "codeql/python/ql/src/experimental/Security/CWE-074/TemplateInjection.ql",
     "codeql/python/ql/src/experimental/Security/CWE-079/ReflectedXSS.ql",
     "codeql/python/ql/src/experimental/Security/CWE-091/Xslt.ql",
@@ -385,6 +386,7 @@
     "codeql/python/ql/src/experimental/Security/CWE-287/ImproperLdapAuth.ql",
     "codeql/python/ql/src/experimental/Security/CWE-327/Azure/UnsafeUsageOfClientSideEncryptionVersion.ql",
     "codeql/python/ql/src/experimental/Security/CWE-338/InsecureRandomness.ql",
+    "codeql/python/ql/src/experimental/Security/CWE-340/TokenBuiltFromUUID.ql",
     "codeql/python/ql/src/experimental/Security/CWE-347/JWTEmptyKeyOrAlgorithm.ql",
     "codeql/python/ql/src/experimental/Security/CWE-347/JWTMissingSecretOrPublicKeyVerification.ql",
     "codeql/python/ql/src/experimental/Security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.ql",
diff --git a/python/README.md b/python/README.md
index 689302f882..9c1a34b29f 100644
--- a/python/README.md
+++ b/python/README.md
@@ -8,7 +8,7 @@
 | `extended` | 45 | Security Extended Suite | `codeql/python/ql/src/codeql-suites/security-extended` |
 | `quality` | 167 | Security and Quality Extended Suite | `codeql/python/ql/src/codeql-suites/security-and-quality` |
 | `local-variants` | 49 | Security Extended with local variants enabled | `advanced-security/codeql-queries/python/suites/codeql-python-local.qls@main` |
-| `super-extended` | 78 | Security Extended with Experimental and Custom Queries Suite | `advanced-security/codeql-queries/python/suites/codeql-python.qls@main` |
+| `super-extended` | 80 | Security Extended with Experimental and Custom Queries Suite | `advanced-security/codeql-queries/python/suites/codeql-python.qls@main` |
 | `audit` | 6 | Security Audit Query Suite | `advanced-security/codeql-queries/python/suites/codeql-python-audit.qls@main` |
 
 
diff --git a/ruby/.data/queries.json b/ruby/.data/queries.json
index 342e86120e..48c52d3afa 100644
--- a/ruby/.data/queries.json
+++ b/ruby/.data/queries.json
@@ -7,8 +7,10 @@
     "codeql/ruby/ql/src/queries/security/cwe-078/CommandInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-078/KernelOpen.ql",
     "codeql/ruby/ql/src/queries/security/cwe-078/NonConstantKernelOpen.ql",
+    "codeql/ruby/ql/src/queries/security/cwe-078/UnsafeShellCommandConstruction.ql",
     "codeql/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql",
     "codeql/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql",
+    "codeql/ruby/ql/src/queries/security/cwe-079/UnsafeHtmlConstruction.ql",
     "codeql/ruby/ql/src/queries/security/cwe-089/SqlInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-094/CodeInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-116/BadTagFilter.ql",
@@ -18,6 +20,7 @@
     "codeql/ruby/ql/src/queries/security/cwe-1333/ReDoS.ql",
     "codeql/ruby/ql/src/queries/security/cwe-1333/RegExpInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-134/TaintedFormatString.ql",
+    "codeql/ruby/ql/src/queries/security/cwe-209/StackTraceExposure.ql",
     "codeql/ruby/ql/src/queries/security/cwe-300/InsecureDependencyResolution.ql",
     "codeql/ruby/ql/src/queries/security/cwe-312/CleartextLogging.ql",
     "codeql/ruby/ql/src/queries/security/cwe-312/CleartextStorage.ql",
@@ -45,8 +48,10 @@
     "codeql/ruby/ql/src/queries/security/cwe-078/CommandInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-078/KernelOpen.ql",
     "codeql/ruby/ql/src/queries/security/cwe-078/NonConstantKernelOpen.ql",
+    "codeql/ruby/ql/src/queries/security/cwe-078/UnsafeShellCommandConstruction.ql",
     "codeql/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql",
     "codeql/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql",
+    "codeql/ruby/ql/src/queries/security/cwe-079/UnsafeHtmlConstruction.ql",
     "codeql/ruby/ql/src/queries/security/cwe-089/SqlInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-094/CodeInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-116/BadTagFilter.ql",
@@ -56,6 +61,7 @@
     "codeql/ruby/ql/src/queries/security/cwe-1333/ReDoS.ql",
     "codeql/ruby/ql/src/queries/security/cwe-1333/RegExpInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-134/TaintedFormatString.ql",
+    "codeql/ruby/ql/src/queries/security/cwe-209/StackTraceExposure.ql",
     "codeql/ruby/ql/src/queries/security/cwe-300/InsecureDependencyResolution.ql",
     "codeql/ruby/ql/src/queries/security/cwe-312/CleartextLogging.ql",
     "codeql/ruby/ql/src/queries/security/cwe-312/CleartextStorage.ql",
@@ -69,6 +75,7 @@
     "codeql/ruby/ql/src/queries/security/cwe-829/InsecureDownload.ql",
     "codeql/ruby/ql/src/queries/security/cwe-918/ServerSideRequestForgery.ql",
     "codeql/ruby/ql/src/queries/security/cwe-020/MissingRegExpAnchor.ql",
+    "codeql/ruby/ql/src/queries/security/cwe-094/UnsafeCodeConstruction.ql",
     "codeql/ruby/ql/src/queries/security/cwe-117/LogInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-295/RequestWithoutValidation.ql",
     "codeql/ruby/ql/src/queries/security/cwe-506/HardcodedDataInterpretedAsCode.ql",
@@ -89,8 +96,10 @@
     "codeql/ruby/ql/src/queries/security/cwe-078/CommandInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-078/KernelOpen.ql",
     "codeql/ruby/ql/src/queries/security/cwe-078/NonConstantKernelOpen.ql",
+    "codeql/ruby/ql/src/queries/security/cwe-078/UnsafeShellCommandConstruction.ql",
     "codeql/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql",
     "codeql/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql",
+    "codeql/ruby/ql/src/queries/security/cwe-079/UnsafeHtmlConstruction.ql",
     "codeql/ruby/ql/src/queries/security/cwe-089/SqlInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-094/CodeInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-116/BadTagFilter.ql",
@@ -100,6 +109,7 @@
     "codeql/ruby/ql/src/queries/security/cwe-1333/ReDoS.ql",
     "codeql/ruby/ql/src/queries/security/cwe-1333/RegExpInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-134/TaintedFormatString.ql",
+    "codeql/ruby/ql/src/queries/security/cwe-209/StackTraceExposure.ql",
     "codeql/ruby/ql/src/queries/security/cwe-300/InsecureDependencyResolution.ql",
     "codeql/ruby/ql/src/queries/security/cwe-312/CleartextLogging.ql",
     "codeql/ruby/ql/src/queries/security/cwe-312/CleartextStorage.ql",
@@ -113,6 +123,7 @@
     "codeql/ruby/ql/src/queries/security/cwe-829/InsecureDownload.ql",
     "codeql/ruby/ql/src/queries/security/cwe-918/ServerSideRequestForgery.ql",
     "codeql/ruby/ql/src/queries/security/cwe-020/MissingRegExpAnchor.ql",
+    "codeql/ruby/ql/src/queries/security/cwe-094/UnsafeCodeConstruction.ql",
     "codeql/ruby/ql/src/queries/security/cwe-117/LogInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-295/RequestWithoutValidation.ql",
     "codeql/ruby/ql/src/queries/security/cwe-506/HardcodedDataInterpretedAsCode.ql",
@@ -133,8 +144,10 @@
     "codeql/ruby/ql/src/queries/security/cwe-078/CommandInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-078/KernelOpen.ql",
     "codeql/ruby/ql/src/queries/security/cwe-078/NonConstantKernelOpen.ql",
+    "codeql/ruby/ql/src/queries/security/cwe-078/UnsafeShellCommandConstruction.ql",
     "codeql/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql",
     "codeql/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql",
+    "codeql/ruby/ql/src/queries/security/cwe-079/UnsafeHtmlConstruction.ql",
     "codeql/ruby/ql/src/queries/security/cwe-089/SqlInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-094/CodeInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-116/BadTagFilter.ql",
@@ -144,6 +157,7 @@
     "codeql/ruby/ql/src/queries/security/cwe-1333/ReDoS.ql",
     "codeql/ruby/ql/src/queries/security/cwe-1333/RegExpInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-134/TaintedFormatString.ql",
+    "codeql/ruby/ql/src/queries/security/cwe-209/StackTraceExposure.ql",
     "codeql/ruby/ql/src/queries/security/cwe-300/InsecureDependencyResolution.ql",
     "codeql/ruby/ql/src/queries/security/cwe-312/CleartextLogging.ql",
     "codeql/ruby/ql/src/queries/security/cwe-312/CleartextStorage.ql",
@@ -157,6 +171,7 @@
     "codeql/ruby/ql/src/queries/security/cwe-829/InsecureDownload.ql",
     "codeql/ruby/ql/src/queries/security/cwe-918/ServerSideRequestForgery.ql",
     "codeql/ruby/ql/src/queries/security/cwe-020/MissingRegExpAnchor.ql",
+    "codeql/ruby/ql/src/queries/security/cwe-094/UnsafeCodeConstruction.ql",
     "codeql/ruby/ql/src/queries/security/cwe-117/LogInjection.ql",
     "codeql/ruby/ql/src/queries/security/cwe-295/RequestWithoutValidation.ql",
     "codeql/ruby/ql/src/queries/security/cwe-506/HardcodedDataInterpretedAsCode.ql",
diff --git a/ruby/README.md b/ruby/README.md
index 22f13f24cd..131d20e235 100644
--- a/ruby/README.md
+++ b/ruby/README.md
@@ -11,10 +11,10 @@
 <!-- AUTOMATION-SUITES -->
 | Name | Queries Count | Description | Path |
 | :--- | :---- | :--- | :--- |
-| `default` | 36 | Default Query Suite | `codeql/ruby/ql/src/codeql-suites/code-scanning` |
-| `extended` | 42 | Security Extended Suite | `codeql/ruby/ql/src/codeql-suites/security-extended` |
-| `quality` | 42 | Security and Quality Extended Suite | `codeql/ruby/ql/src/codeql-suites/security-and-quality` |
-| `super-extended` | 41 | Security Extended with Experimental and Custom Queries Suite | `advanced-security/codeql-queries/ruby/suites/codeql-ruby.qls@main` |
+| `default` | 39 | Default Query Suite | `codeql/ruby/ql/src/codeql-suites/code-scanning` |
+| `extended` | 46 | Security Extended Suite | `codeql/ruby/ql/src/codeql-suites/security-extended` |
+| `quality` | 46 | Security and Quality Extended Suite | `codeql/ruby/ql/src/codeql-suites/security-and-quality` |
+| `super-extended` | 45 | Security Extended with Experimental and Custom Queries Suite | `advanced-security/codeql-queries/ruby/suites/codeql-ruby.qls@main` |
 
 
 <!-- AUTOMATION-SUITES -->
diff --git a/swift/.data/queries.json b/swift/.data/queries.json
index bcfa4842cd..13606c24e6 100644
--- a/swift/.data/queries.json
+++ b/swift/.data/queries.json
@@ -1,33 +1,69 @@
 {
   "default": [
+    "codeql/swift/ql/src/queries/Security/CWE-022/PathInjection.ql",
     "codeql/swift/ql/src/queries/Security/CWE-079/UnsafeWebViewFetch.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-089/SqlInjection.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-094/UnsafeJsEval.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-1204/StaticInitializationVector.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-134/UncontrolledFormatString.ql",
     "codeql/swift/ql/src/queries/Security/CWE-135/StringLengthConflation.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-259/ConstantPassword.ql",
     "codeql/swift/ql/src/queries/Security/CWE-311/CleartextTransmission.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-312/CleartextLogging.ql",
     "codeql/swift/ql/src/queries/Security/CWE-321/HardcodedEncryptionKey.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-327/ECBEncryption.ql",
     "codeql/swift/ql/src/queries/Security/CWE-328/WeakSensitiveDataHashing.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-611/XXE.ql",
     "codeql/swift/ql/src/queries/Security/CWE-757/InsecureTLS.ql",
-    "codeql/swift/ql/src/queries/Security/ECB-Encryption/ECBEncryption.ql"
+    "codeql/swift/ql/src/queries/Security/CWE-760/ConstantSalt.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-916/InsufficientHashIterations.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-943/PredicateInjection.ql",
+    "codeql/swift/ql/src/diagnostics/internal/ExtractionErrors.ql"
   ],
   "extended": [
+    "codeql/swift/ql/src/queries/Security/CWE-022/PathInjection.ql",
     "codeql/swift/ql/src/queries/Security/CWE-079/UnsafeWebViewFetch.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-089/SqlInjection.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-094/UnsafeJsEval.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-1204/StaticInitializationVector.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-134/UncontrolledFormatString.ql",
     "codeql/swift/ql/src/queries/Security/CWE-135/StringLengthConflation.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-259/ConstantPassword.ql",
     "codeql/swift/ql/src/queries/Security/CWE-311/CleartextTransmission.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-312/CleartextLogging.ql",
     "codeql/swift/ql/src/queries/Security/CWE-321/HardcodedEncryptionKey.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-327/ECBEncryption.ql",
     "codeql/swift/ql/src/queries/Security/CWE-328/WeakSensitiveDataHashing.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-611/XXE.ql",
     "codeql/swift/ql/src/queries/Security/CWE-757/InsecureTLS.ql",
-    "codeql/swift/ql/src/queries/Security/ECB-Encryption/ECBEncryption.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-760/ConstantSalt.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-916/InsufficientHashIterations.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-943/PredicateInjection.ql",
     "codeql/swift/ql/src/queries/Security/CWE-311/CleartextStorageDatabase.ql",
-    "codeql/swift/ql/src/queries/Security/CWE-312/CleartextStoragePreferences.ql"
+    "codeql/swift/ql/src/queries/Security/CWE-312/CleartextStoragePreferences.ql",
+    "codeql/swift/ql/src/diagnostics/internal/ExtractionErrors.ql"
   ],
   "quality": [
+    "codeql/swift/ql/src/queries/Security/CWE-022/PathInjection.ql",
     "codeql/swift/ql/src/queries/Security/CWE-079/UnsafeWebViewFetch.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-089/SqlInjection.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-094/UnsafeJsEval.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-1204/StaticInitializationVector.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-134/UncontrolledFormatString.ql",
     "codeql/swift/ql/src/queries/Security/CWE-135/StringLengthConflation.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-259/ConstantPassword.ql",
     "codeql/swift/ql/src/queries/Security/CWE-311/CleartextTransmission.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-312/CleartextLogging.ql",
     "codeql/swift/ql/src/queries/Security/CWE-321/HardcodedEncryptionKey.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-327/ECBEncryption.ql",
     "codeql/swift/ql/src/queries/Security/CWE-328/WeakSensitiveDataHashing.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-611/XXE.ql",
     "codeql/swift/ql/src/queries/Security/CWE-757/InsecureTLS.ql",
-    "codeql/swift/ql/src/queries/Security/ECB-Encryption/ECBEncryption.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-760/ConstantSalt.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-916/InsufficientHashIterations.ql",
+    "codeql/swift/ql/src/queries/Security/CWE-943/PredicateInjection.ql",
     "codeql/swift/ql/src/queries/Security/CWE-311/CleartextStorageDatabase.ql",
-    "codeql/swift/ql/src/queries/Security/CWE-312/CleartextStoragePreferences.ql"
+    "codeql/swift/ql/src/queries/Security/CWE-312/CleartextStoragePreferences.ql",
+    "codeql/swift/ql/src/diagnostics/internal/ExtractionErrors.ql"
   ]
 }
\ No newline at end of file
diff --git a/swift/README.md b/swift/README.md
index 4bc39b4227..c9bcc878e7 100644
--- a/swift/README.md
+++ b/swift/README.md
@@ -4,9 +4,9 @@
 <!-- AUTOMATION-SUITES -->
 | Name | Queries Count | Description | Path |
 | :--- | :---- | :--- | :--- |
-| `default` | 7 | Default Query Suite | `codeql/swift/ql/src/codeql-suites/code-scanning` |
-| `extended` | 9 | Security Extended Suite | `codeql/swift/ql/src/codeql-suites/security-extended` |
-| `quality` | 9 | Security and Quality Extended Suite | `codeql/swift/ql/src/codeql-suites/security-and-quality` |
+| `default` | 19 | Default Query Suite | `codeql/swift/ql/src/codeql-suites/code-scanning` |
+| `extended` | 21 | Security Extended Suite | `codeql/swift/ql/src/codeql-suites/security-extended` |
+| `quality` | 21 | Security and Quality Extended Suite | `codeql/swift/ql/src/codeql-suites/security-and-quality` |
 
 
 <!-- AUTOMATION-SUITES -->