diff --git a/.circleci/config.yml b/.circleci/config.yml
index 34573b09483..646d54b8cc1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -177,7 +177,7 @@ workflows:
 
 linux-defaults: &linux-defaults
   docker:
-    - image: cimg/node:18.20-browsers
+    - image: cimg/node:20.15-browsers
   working_directory: ~/mapbox-gl-js
 
 mac-defaults: &mac-defaults
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 2ece201a3e0..0822bc9ea53 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -38,6 +38,12 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
+    - if: matrix.language == 'javascript-typescript'
+      name: Setup Node.js 20.x
+      uses: actions/setup-node@v4
+      with:
+        node-version: 20.x
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
diff --git a/.nvmrc b/.nvmrc
index 123b052798d..b8e593f5210 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-18.20.2
+20.15.1
diff --git a/3d-style/render/shadow_renderer.ts b/3d-style/render/shadow_renderer.ts
index 968767a98fc..c9ceca202aa 100644
--- a/3d-style/render/shadow_renderer.ts
+++ b/3d-style/render/shadow_renderer.ts
@@ -54,6 +54,7 @@ type ShadowNormalOffsetMode = 'vector-tile' | 'model-tile';
 
 const shadowParameters = {
     cascadeCount: 2,
+    normalOffset: 3,
     shadowMapResolution: 2048
 };
 
@@ -168,6 +169,7 @@ export class ShadowRenderer {
 
         painter.tp.registerParameter(this, ["Shadows"], "_forceDisable", {label: "forceDisable"}, () => { this.painter.style.map.triggerRepaint(); });
         painter.tp.registerParameter(shadowParameters, ["Shadows"], "cascadeCount", {min: 1, max: 2, step: 1});
+        painter.tp.registerParameter(shadowParameters, ["Shadows"], "normalOffset", {min: 0, max: 10, step: 0.05});
         painter.tp.registerParameter(shadowParameters, ["Shadows"], "shadowMapResolution", {min: 32, max: 2048, step: 32});
         painter.tp.registerBinding(this, ["Shadows"], "_numCascadesToRender", {readonly: true, label: 'numCascadesToRender'});
     }
@@ -500,7 +502,7 @@ export class ShadowRenderer {
         this.useNormalOffset = normalOffset;
 
         if (normalOffset) {
-            const scale = 5.0; // Experimentally found value
+            const scale = shadowParameters.normalOffset;
             uniforms["u_shadow_normal_offset"] = [1.0, scale, scale]; // meterToTile isn't used
             uniforms["u_shadow_bias"] = [0.00006, 0.0012, 0.012]; // Reduce constant offset
         } else {
diff --git a/3d-style/shaders/_prelude_shadow.vertex.glsl b/3d-style/shaders/_prelude_shadow.vertex.glsl
index 46cfcd3a9d7..c28a750f0ef 100644
--- a/3d-style/shaders/_prelude_shadow.vertex.glsl
+++ b/3d-style/shaders/_prelude_shadow.vertex.glsl
@@ -14,7 +14,9 @@ vec3 shadow_normal_offset(vec3 normal) {
 }
 
 vec3 shadow_normal_offset_model(vec3 normal) {
-    float dotScale = min(1.0 - dot(normal, u_shadow_direction), 1.0) * 0.5 + 0.5;
+    vec3 transformed_normal = vec3(-normal.xy, normal.z);
+    float NDotL = dot(normalize(transformed_normal), u_shadow_direction);
+    float dotScale = min(1.0 - NDotL, 1.0) * 0.5 + 0.5;
     return normal * dotScale;
 }
 
diff --git a/3d-style/shaders/model.fragment.glsl b/3d-style/shaders/model.fragment.glsl
index f78252830ab..dcf9d097224 100644
--- a/3d-style/shaders/model.fragment.glsl
+++ b/3d-style/shaders/model.fragment.glsl
@@ -19,8 +19,8 @@ in highp vec4 v_position_height;
 in lowp vec4 v_color_mix;
 
 #ifdef RENDER_SHADOWS
-in vec4 v_pos_light_view_0;
-in vec4 v_pos_light_view_1;
+in highp vec4 v_pos_light_view_0;
+in highp vec4 v_pos_light_view_1;
 in float v_depth_shadows;
 #endif
 
diff --git a/3d-style/shaders/model.vertex.glsl b/3d-style/shaders/model.vertex.glsl
index ae5e0ca997c..079e808de5b 100644
--- a/3d-style/shaders/model.vertex.glsl
+++ b/3d-style/shaders/model.vertex.glsl
@@ -39,8 +39,8 @@ uniform highp mat4 u_normal_matrix;
 #ifdef RENDER_SHADOWS
 uniform mat4 u_light_matrix_0;
 uniform mat4 u_light_matrix_1;
-out vec4 v_pos_light_view_0;
-out vec4 v_pos_light_view_1;
+out highp vec4 v_pos_light_view_0;
+out highp vec4 v_pos_light_view_1;
 out float v_depth_shadows;
 #endif
 
@@ -181,7 +181,7 @@ void main() {
     vec3 offset = shadow_normal_offset(vec3(-normal_3f.xy, normal_3f.z));
     shadow_pos.xyz += offset * shadow_normal_offset_multiplier0();
 #else
-    vec3 offset = shadow_normal_offset_model(normalize(normal_3f));
+    vec3 offset = shadow_normal_offset_model(normal_3f);
     shadow_pos.xyz += offset * shadow_normal_offset_multiplier0();
 #endif
 #endif // HAS_ATTRIBUTE_a_normal_3f
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe0c20e5732..ce707d1cb02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 3.6.0-beta.1
+
+### Features and improvements ✨
+- Improve initial load performance.
+- Add inner glow effect for negative `circle-blur` values.
+- Add support for inlining TileJSON in style source definitions using `data` field.
+- Improve 3D models' shadow appearance.
+- Improve performance of updating config values of a style.
+- Add more descriptive expression evaluation error messages.
+- Improve TypeScript typings.
+
+### Bug fixes 🐞
+- Fix `isSourceLoaded` flag on `sourcedata` event for already loaded sources.
+- Fix firing `load` event when all tiles fail to load.
+- Fix performance issues when GeoJSON in `dynamic` mode is updated too frequently.
+- Fix rasterarray layer flickering from stale tiles cache.
+- Fix spikes when viewing terrain-enabled maps in certain environments.
+
 ## 3.5.2
 
 - Improve 3D models rendering performance.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2053abb70b2..f28591b9350 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,9 +9,9 @@ Install the Xcode Command Line Tools Package
 xcode-select --install
 ```
 
-Install [node.js](https://nodejs.org/) version 18
+Install [node.js](https://nodejs.org/) version 20
 ```bash
-brew install node@18
+brew install node@20
 ```
 
 Clone the repository
@@ -26,10 +26,10 @@ npm install
 
 ### Linux
 
-Install [git](https://git-scm.com/), [node.js](https://nodejs.org/) version 18, [GNU Make](http://www.gnu.org/software/make/), and libglew-dev
+Install [git](https://git-scm.com/), [node.js](https://nodejs.org/) version 20, [GNU Make](http://www.gnu.org/software/make/), and libglew-dev
 ```bash
 sudo apt-get update
-curl -sL https://deb.nodesource.com/setup_18.x | sudo bash -
+curl -sL https://deb.nodesource.com/setup_20.x | sudo bash -
 sudo apt-get install build-essential git nodejs libglew-dev libxi-dev
 ```
 
@@ -45,7 +45,7 @@ npm install
 
 ### Windows
 
-Install [git](https://git-scm.com/), [node.js](https://nodejs.org/) version 18, [npm and node-gyp](https://github.com/Microsoft/nodejs-guidelines/blob/master/windows-environment.md#compiling-native-addon-modules).
+Install [git](https://git-scm.com/), [node.js](https://nodejs.org/) version 20, [npm and node-gyp](https://github.com/Microsoft/nodejs-guidelines/blob/master/windows-environment.md#compiling-native-addon-modules).
 
 Clone the repository
 ```bash
diff --git a/build/generate-typed-style-spec.ts b/build/generate-typed-style-spec.ts
index fa4064e0d1f..0fdbaba40c0 100644
--- a/build/generate-typed-style-spec.ts
+++ b/build/generate-typed-style-spec.ts
@@ -236,6 +236,7 @@ export type ResolvedImageSpecification = string;
 export type PromoteIdSpecification = {[_: string]: string} | string;
 
 export type FilterSpecification =
+    | ExpressionSpecification
     | ['has', string]
     | ['!has', string]
     | ['==', string, string | number | boolean]
diff --git a/build/publish.sh b/build/publish.sh
index 730e8255bf3..4d080f6518d 100755
--- a/build/publish.sh
+++ b/build/publish.sh
@@ -35,9 +35,3 @@ git tag --points-at HEAD | while read tag; do
         echo "Unrecognized tag: $tag"
     fi
 done
-
-if [ -n "$(git tag --points-at HEAD)" ]; then
-    node build/generate-release-list.js &&
-    aws s3 cp --acl public-read --content-type application/json dist/versions.json s3://mapbox-gl-js/versions.json &&
-    aws s3 cp --acl public-read --content-type application/javascript dist/versions.jsonp s3://mapbox-gl-js/versions.jsonp
-fi
diff --git a/build/upload.sh b/build/upload.sh
index 78c25ddc6de..de116729138 100755
--- a/build/upload.sh
+++ b/build/upload.sh
@@ -88,3 +88,6 @@ do
 		aws s3 cp --acl public-read --content-type ${mimetype} ./dist/${file} s3://mapbox-gl-js/${tag}/${file}
 	fi
 done
+
+aws s3 cp --acl public-read --content-type application/json dist/versions.json s3://mapbox-gl-js/versions.json &&
+aws s3 cp --acl public-read --content-type application/javascript dist/versions.jsonp s3://mapbox-gl-js/versions.jsonp
diff --git a/buildspec.yml b/buildspec.yml
index cbb684656e0..eec31a951d5 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -3,7 +3,7 @@ version: 0.2
 phases:
   install:
     runtime-versions:
-      nodejs: 18
+      nodejs: 20
     commands:
       - echo "//registry.npmjs.org/:_authToken=$NPMAccessToken" > ~/.npmrc
       - npm whoami
diff --git a/debug/circles.html b/debug/circles.html
index 902ebd9ce6f..b52981296f4 100644
--- a/debug/circles.html
+++ b/debug/circles.html
@@ -22,6 +22,7 @@
 <div id='checkboxes'>
     <label><input id='terrain-checkbox' type='checkbox' checked> terrain</label><br />
     <label><input id='globe-checkbox' type='checkbox'> globe</label><br />
+    <label><input type="range" min="-100" max="100" value="0" class="slider" id="blur-slider"> blur: </label><label id='glow'>0.0</label><br />
 </div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
@@ -101,6 +102,12 @@
     map.setProjection(this.checked ? "globe" : null);
 };
 
+document.getElementById('blur-slider').oninput = function() {
+    const glow = parseInt(this.value) / 100.0;
+    map.setPaintProperty("circles", 'circle-blur', glow);
+    document.getElementById('glow').innerHTML = glow;
+};
+
 let hovered = [];
 window.addEventListener('mousemove', function(e) {
     e.point = new mapboxgl.Point(e.clientX, e.clientY);
diff --git a/debug/i18n.html b/debug/i18n.html
index ca189c9d5f6..7575977651e 100644
--- a/debug/i18n.html
+++ b/debug/i18n.html
@@ -153,7 +153,7 @@
 });
 
 map.addControl(new mapboxgl.ScaleControl());
-mapboxgl.setRTLTextPlugin('https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.3/mapbox-gl-rtl-text.js');
+mapboxgl.setRTLTextPlugin('https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.3.0/mapbox-gl-rtl-text.js');
 
 map.on('style.load', () => {
     map.addSource('mapbox://mapbox.mapbox-streets-v8-i18n', {
diff --git a/debug/raster-particle-layer.html b/debug/raster-particle-layer.html
index b90fd15b4af..50f7172097d 100644
--- a/debug/raster-particle-layer.html
+++ b/debug/raster-particle-layer.html
@@ -60,51 +60,18 @@
 <script type='text/javascript' src="https://cdn.jsdelivr.net/npm/tweakpane@3.1.9/dist/tweakpane.min.js"></script>
 
 <script>
-const SPEED_FACTOR_DEFAULT = 0.6;
-const RESET_RATE_FACTOR_DEFAULT = 0.4;
-const PARTICLE_COUNT_DEFAULT = 1024;
-
 const PARAMS = {
     projection: 'globe',
     showTileBoundaries: false,
     fadeOpacityFactor: 0.98,
-    speedFactor: SPEED_FACTOR_DEFAULT,
-    maxSpeed: 70,
-    resetRateFactor: RESET_RATE_FACTOR_DEFAULT,
-    particleCount: PARTICLE_COUNT_DEFAULT,
+    speedFactor: 0.6,
+    maxSpeed: 40,
+    resetRateFactor: 0.4,
+    particleCount: 2048,
     bandIndex: 0,
 };
 
-// These are contained in debug/wind-512-mrt/tile.json.
-const BANDS = [
-    "1708300800",
-    "1708311600",
-    "1708322400",
-    "1708333200",
-    "1708344000",
-    "1708354800",
-    "1708365600",
-    "1708376400",
-    "1708387200",
-    "1708398000",
-    "1708408800",
-    "1708419600",
-    "1708430400",
-    "1708441200",
-    "1708452000",
-    "1708462800",
-    "1708473600",
-    "1708484400",
-    "1708495200",
-    "1708506000",
-    "1708516800",
-    "1708527600",
-    "1708538400",
-    "1708549200",
-    "1708560000",
-    "1708570800",
-    "1708581600"
-];
+const RASTERARRAY_LAYER = '10winds';
 
 window.onload = function() {
     const gui = new Tweakpane.Pane({  // eslint-disable-line
@@ -156,24 +123,38 @@
         map.setPaintProperty('wind-layer', 'raster-particle-reset-rate-factor', ev.value);
     });
 
-    const particleCountSlider = gui.addInput(PARAMS, 'particleCount', {min: 64, max: 2048});
+    const particleCountSlider = gui.addInput(PARAMS, 'particleCount', {min: 64, max: 4096});
     particleCountSlider.on('change', (ev) => {
         map.setPaintProperty('wind-layer', 'raster-particle-count', ev.value);
     });
 
-    const bandSlider = gui.addInput(PARAMS, 'bandIndex', {min: 0, max: BANDS.length - 1, step: 1});
-    bandSlider.on('change', (ev) => {
-        const band = BANDS[ev.value];
-        map.setPaintProperty('wind-layer', 'raster-particle-array-band', band);
+    let bandSlider;
+    let bandList;
+    map.on('sourcedata', ({sourceId}) => {
+        const layer = map.getSource(sourceId)?.rasterLayers?.find(({id}) => id === RASTERARRAY_LAYER);
+        if (!layer?.fields?.bands) return;
+
+        // Exit early if the list of bands is unchanged
+        if (JSON.stringify(layer.fields.bands) === JSON.stringify(bandList)) return;
+        bandList = layer.fields.bands;
+
+        // Remove the existing slider before recreating
+        if (bandSlider) bandSlider.dispose();
+
+        // Create a new band slider with the updated list
+        bandSlider = gui.addInput(PARAMS, 'bandIndex', {min: 0, max: bandList.length - 1, step: 1});
+        bandSlider.on('change', ({value}) => {
+            map.setPaintProperty('wind-layer', 'raster-particle-array-band', bandList[value]);
+        });
     });
 };
 
 const map = new mapboxgl.Map({
     container: 'map',
-    maxZoom: 8,
+    maxZoom: 2,
     minZoom: 2,
-    zoom: 3,
-    center: [138, 36],
+    zoom: 2,
+    center: [-28, 47],
     // Choose from Mapbox's core styles, or make your own style with Mapbox Studio
     style: 'mapbox://styles/mapbox/dark-v11'
 });
@@ -181,102 +162,83 @@
 map.on('load', () => {
     map.addSource('raster-array-source', {
         'type': 'raster-array',
-        'tiles': [ `https://api.mapbox.com/rasterarrays/v1/demo/mapboxsatellite.msm-wind-512-tuned/{z}/{x}/{y}.mrt?jobid=123abc&access_token=${mapboxgl.accessToken}` ],
-        "raster_layers": [
-            {
-                "fields": {
-                    "range": [
-                        -6.97,
-                        37.27
-                    ],
-                    "name": "wind",
-                    "units": "m/s",
-                    "tilesize": 512,
-                    "buffer": 1,
-                    "bands": [
-                        "1708300800",
-                        "1708311600",
-                        "1708322400",
-                        "1708333200",
-                        "1708344000",
-                        "1708354800",
-                        "1708365600",
-                        "1708376400",
-                        "1708387200",
-                        "1708398000",
-                        "1708408800",
-                        "1708419600",
-                        "1708430400",
-                        "1708441200",
-                        "1708452000",
-                        "1708462800",
-                        "1708473600",
-                        "1708484400",
-                        "1708495200",
-                        "1708506000",
-                        "1708516800",
-                        "1708527600",
-                        "1708538400",
-                        "1708549200",
-                        "1708560000",
-                        "1708570800",
-                        "1708581600"
-                    ]
-                },
-                "id": "wind"
-            }
-        ],
-        'bounds': [
-            119.96875,
-            22.375,
-            150.03125,
-            47.62499999999999
-        ]
+        'url': 'mapbox://rasterarrayexamples.gfs-winds',
+        'tileSize': 512
     });
 
     map.addLayer({
         'id': 'wind-layer',
         'type': 'raster-particle',
         'source': 'raster-array-source',
-        'source-layer': 'wind',
+        'source-layer': RASTERARRAY_LAYER,
         'paint': {
-            'raster-particle-speed-factor': SPEED_FACTOR_DEFAULT,
-            'raster-particle-reset-rate-factor': RESET_RATE_FACTOR_DEFAULT,
-            'raster-particle-count': PARTICLE_COUNT_DEFAULT,
-            'raster-particle-max-speed': 70,
+            'raster-particle-speed-factor': PARAMS.speedFactor,
+            'raster-particle-fade-opacity-factor': PARAMS.fadeOpacityFactor,
+            'raster-particle-reset-rate-factor': PARAMS.resetRateFactor,
+            'raster-particle-count': PARAMS.particleCount,
+            'raster-particle-max-speed': 40,
             'raster-particle-color': [
-                "interpolate",
-                ["linear"],
-                ["raster-particle-speed"],
-                1.5, "rgba(134,163,171,256)",
-                2.5, "rgba(126,152,188,256)",
-                4.12, "rgba(110,143,208,256)",
-                4.63, "rgba(110,143,208,256)",
-                6.17, "rgba(15,147,167,256)",
-                7.72, "rgba(15,147,167,256)",
-                9.26, "rgba(57,163,57,256)",
-                10.29, "rgba(57,163,57,256)",
-                11.83, "rgba(194,134,62,256)",
-                13.37, "rgba(194,134,63,256)",
-                14.92, "rgba(200,66,13,256)",
-                16.46, "rgba(200,66,13,256)",
-                18.00, "rgba(210,0,50,256)",
-                20.06, "rgba(215,0,50,256)",
-                21.60, "rgba(175,80,136,256)",
-                23.66, "rgba(175,80,136,256)",
-                25.21, "rgba(117,74,147,256)",
-                27.78, "rgba(117,74,147,256)",
-                29.32, "rgba(68,105,141,256)",
-                31.89, "rgba(68,105,141,256)",
-                33.44, "rgba(194,251,119,256)",
-                42.18, "rgba(194,251,119,256)",
-                43.72, "rgba(241,255,109,256)",
-                48.87, "rgba(241,255,109,256)",
-                50.41, "rgba(256,256,256,256)",
-                57.61, "rgba(256,256,256,256)",
-                59.16, "rgba(0,256,256,256)",
-                68.93, "rgba(0,256,256,256)",
-                69.44, "rgba(256,37,256,256)"
+                'interpolate',
+                ['linear'],
+                ['raster-particle-speed'],
+                1.5,
+                'rgba(134,163,171,256)',
+                2.5,
+                'rgba(126,152,188,256)',
+                4.12,
+                'rgba(110,143,208,256)',
+                4.63,
+                'rgba(110,143,208,256)',
+                6.17,
+                'rgba(15,147,167,256)',
+                7.72,
+                'rgba(15,147,167,256)',
+                9.26,
+                'rgba(57,163,57,256)',
+                10.29,
+                'rgba(57,163,57,256)',
+                11.83,
+                'rgba(194,134,62,256)',
+                13.37,
+                'rgba(194,134,63,256)',
+                14.92,
+                'rgba(200,66,13,256)',
+                16.46,
+                'rgba(200,66,13,256)',
+                18.0,
+                'rgba(210,0,50,256)',
+                20.06,
+                'rgba(215,0,50,256)',
+                21.6,
+                'rgba(175,80,136,256)',
+                23.66,
+                'rgba(175,80,136,256)',
+                25.21,
+                'rgba(117,74,147,256)',
+                27.78,
+                'rgba(117,74,147,256)',
+                29.32,
+                'rgba(68,105,141,256)',
+                31.89,
+                'rgba(68,105,141,256)',
+                33.44,
+                'rgba(194,251,119,256)',
+                42.18,
+                'rgba(194,251,119,256)',
+                43.72,
+                'rgba(241,255,109,256)',
+                48.87,
+                'rgba(241,255,109,256)',
+                50.41,
+                'rgba(256,256,256,256)',
+                57.61,
+                'rgba(256,256,256,256)',
+                59.16,
+                'rgba(0,256,256,256)',
+                68.93,
+                'rgba(0,256,256,256)',
+                69.44,
+                'rgba(256,37,256,256)'
             ]
         }
     });
diff --git a/debug/standard-style.html b/debug/standard-style.html
index 7969e171c8f..182e52e0929 100644
--- a/debug/standard-style.html
+++ b/debug/standard-style.html
@@ -63,7 +63,8 @@
             'dynamic',
             'mapbox://styles/mapbox/standard',
             'mapbox://styles/mapbox-map-design/standard-rc',
-            'mapbox://styles/mapbox-map-design/standard-experimental'
+            'mapbox://styles/mapbox-map-design/standard-experimental',
+            'mapbox://styles/mapbox-map-design/standard-satellite-rc'
         ];
 
         const defaultStyle = styles[1];
diff --git a/package-lock.json b/package-lock.json
index 0cf412a0836..2aa9619494f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mapbox-gl",
-  "version": "3.5.2",
+  "version": "3.6.0-beta.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "mapbox-gl",
-      "version": "3.5.2",
+      "version": "3.6.0-beta.1",
       "license": "SEE LICENSE IN LICENSE.txt",
       "workspaces": [
         "src/style-spec",
@@ -30,7 +30,6 @@
         "gl-matrix": "^3.4.3",
         "grid-index": "^1.1.0",
         "kdbush": "^4.0.2",
-        "lodash.clonedeep": "^4.5.0",
         "murmurhash-js": "^1.0.0",
         "pbf": "^3.2.1",
         "potpack": "^2.0.0",
@@ -45,7 +44,7 @@
       },
       "devDependencies": {
         "@mapbox/mvt-fixtures": "^3.10.0",
-        "@octokit/rest": "^21.0.0",
+        "@octokit/rest": "^21.0.1",
         "@rollup/plugin-commonjs": "^26.0.1",
         "@rollup/plugin-json": "^6.1.0",
         "@rollup/plugin-node-resolve": "^15.2.3",
@@ -56,12 +55,12 @@
         "@types/geojson-vt": "^3.2.5",
         "@types/jest": "^29.5.12",
         "@types/mapbox__point-geometry": "^0.1.4",
-        "@types/node": "^20.14.10",
+        "@types/node": "^22.0.0",
         "@types/offscreencanvas": "^2019.7.3",
         "@types/pbf": "^3.0.5",
-        "@typescript-eslint/eslint-plugin": "^7.16.1",
-        "@typescript-eslint/parser": "^7.16.1",
-        "@vitest/browser": "^2.0.3",
+        "@typescript-eslint/eslint-plugin": "^7.18.0",
+        "@typescript-eslint/parser": "^7.18.0",
+        "@vitest/browser": "^2.0.4",
         "@vitest/ui": "^2.0.3",
         "address": "^2.0.3",
         "browserify": "^17.0.0",
@@ -80,7 +79,7 @@
         "eslint-import-resolver-typescript": "^3.6.1",
         "eslint-plugin-html": "^8.1.1",
         "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-jsdoc": "^48.7.0",
+        "eslint-plugin-jsdoc": "^48.9.2",
         "glob": "^11.0.0",
         "is-builtin-module": "^4.0.0",
         "jest-extended": "^4.0.2",
@@ -94,8 +93,8 @@
         "npm-font-open-sans": "^1.1.0",
         "npm-run-all": "^4.1.5",
         "pixelmatch": "^6.0.0",
-        "playwright": "^1.45.1",
-        "postcss": "^8.4.39",
+        "playwright": "^1.45.3",
+        "postcss": "^8.4.40",
         "postcss-cli": "^11.0.0",
         "postcss-inline-svg": "^6.0.0",
         "pretty-bytes": "^6.0.0",
@@ -106,14 +105,14 @@
         "serve-static": "^1.15.0",
         "shuffle-seed": "^1.1.6",
         "st": "^3.0.0",
-        "stylelint": "^16.7.0",
+        "stylelint": "^16.8.0",
         "stylelint-config-standard": "^36.0.1",
         "tape": "^5.8.1",
         "tape-filter": "^1.0.4",
-        "testem": "^3.15.0",
+        "testem": "^3.15.1",
         "tsx": "^4.16.2",
-        "typescript": "^5.5.3",
-        "typescript-eslint": "^7.16.1",
+        "typescript": "^5.5.4",
+        "typescript-eslint": "^7.18.0",
         "utility-types": "^3.11.0",
         "vite-plugin-arraybuffer": "^0.0.8",
         "vitest": "^2.0.3"
@@ -968,6 +967,15 @@
         "node": ">=18"
       }
     },
+    "node_modules/@inquirer/core/node_modules/@types/node": {
+      "version": "20.14.13",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.13.tgz",
+      "integrity": "sha512-+bHoGiZb8UiQ0+WEtmph2IWQCjIqg8MDZMAV+ppRRhUZnquF5mQkP/9vpSwJClEiSM/C7fZZExPzfU0vJTyp8w==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
     "node_modules/@inquirer/core/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -1043,6 +1051,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/@inquirer/core/node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
     "node_modules/@inquirer/core/node_modules/wrap-ansi": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@@ -1770,15 +1784,14 @@
       }
     },
     "node_modules/@octokit/rest": {
-      "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-21.0.0.tgz",
-      "integrity": "sha512-XudXXOmiIjivdjNZ+fN71NLrnDM00sxSZlhqmPR3v0dVoJwyP628tSlc12xqn8nX3N0965583RBw5GPo6r8u4Q==",
+      "version": "21.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-21.0.1.tgz",
+      "integrity": "sha512-RWA6YU4CqK0h0J6tfYlUFnH3+YgBADlxaHXaKSG+BVr2y4PTfbU2tlKuaQoQZ83qaTbi4CUxLNAmbAqR93A6mQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@octokit/core": "^6.1.2",
         "@octokit/plugin-paginate-rest": "^11.0.0",
-        "@octokit/plugin-request-log": "^5.1.0",
+        "@octokit/plugin-request-log": "^5.3.1",
         "@octokit/plugin-rest-endpoint-methods": "^13.0.0"
       },
       "engines": {
@@ -1790,7 +1803,6 @@
       "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-5.1.1.tgz",
       "integrity": "sha512-rh3G3wDO8J9wSjfI436JUKzHIxq8NaiL0tVeB2aXmG6p/9859aUOAjA9pmSPNGGZxfwmaJ9ozOJImuNVJdpvbA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 18"
       }
@@ -1800,7 +1812,6 @@
       "resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.2.tgz",
       "integrity": "sha512-hEb7Ma4cGJGEUNOAVmyfdB/3WirWMg5hDuNFVejGEDFqupeOysLc2sG6HJxY2etBp5YQu5Wtxwi020jS9xlUwg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@octokit/auth-token": "^5.0.0",
         "@octokit/graphql": "^8.0.0",
@@ -1819,7 +1830,6 @@
       "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.1.tgz",
       "integrity": "sha512-JYjh5rMOwXMJyUpj028cu0Gbp7qe/ihxfJMLc8VZBMMqSwLgOxDI1911gV4Enl1QSavAQNJcwmwBF9M0VvLh6Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@octokit/types": "^13.0.0",
         "universal-user-agent": "^7.0.2"
@@ -1833,7 +1843,6 @@
       "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.1.1.tgz",
       "integrity": "sha512-ukiRmuHTi6ebQx/HFRCXKbDlOh/7xEV6QUXaE7MJEKGNAncGI/STSbOkl12qVXZrfZdpXctx5O9X1AIaebiDBg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@octokit/request": "^9.0.0",
         "@octokit/types": "^13.0.0",
@@ -1844,11 +1853,10 @@
       }
     },
     "node_modules/@octokit/rest/node_modules/@octokit/plugin-request-log": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-5.3.0.tgz",
-      "integrity": "sha512-FiGcyjdtYPlr03ExBk/0ysIlEFIFGJQAVoPPMxL19B24bVSEiZQnVGBunNtaAF1YnvE/EFoDpXmITtRnyCiypQ==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-5.3.1.tgz",
+      "integrity": "sha512-n/lNeCtq+9ofhC15xzmJCNKP2BWTv8Ih2TTy+jatNCCq/gQP/V7rK3fjIfuz0pDWDALO/o/4QY4hyOF6TQQFUw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 18"
       },
@@ -1857,11 +1865,10 @@
       }
     },
     "node_modules/@octokit/rest/node_modules/@octokit/request": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.1.1.tgz",
-      "integrity": "sha512-pyAguc0p+f+GbQho0uNetNQMmLG1e80WjkIaqqgUkihqUp0boRU6nKItXO4VWnr+nbZiLGEyy4TeKRwqaLvYgw==",
+      "version": "9.1.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.1.3.tgz",
+      "integrity": "sha512-V+TFhu5fdF3K58rs1pGUJIDH5RZLbZm5BI+MNF+6o/ssFNT4vWlCh/tVpF3NxGtP15HUxTTMUbsG5llAuU2CZA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@octokit/endpoint": "^10.0.0",
         "@octokit/request-error": "^6.0.1",
@@ -1873,11 +1880,10 @@
       }
     },
     "node_modules/@octokit/rest/node_modules/@octokit/request-error": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.1.tgz",
-      "integrity": "sha512-1mw1gqT3fR/WFvnoVpY/zUM2o/XkMs/2AszUUG9I69xn0JFLv6PGkPhNk5lbfvROs79wiS0bqiJNxfCZcRJJdg==",
+      "version": "6.1.4",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.4.tgz",
+      "integrity": "sha512-VpAhIUxwhWZQImo/dWAN/NpPqqojR6PSLgLYAituLM6U+ddx9hCioFGwBr5Mi+oi5CLeJkcAs3gJ0PYYzU6wUg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@octokit/types": "^13.0.0"
       },
@@ -1889,15 +1895,13 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-3.0.2.tgz",
       "integrity": "sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A==",
-      "dev": true,
-      "license": "Apache-2.0"
+      "dev": true
     },
     "node_modules/@octokit/rest/node_modules/universal-user-agent": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.2.tgz",
       "integrity": "sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/@octokit/types": {
       "version": "13.5.0",
@@ -1949,7 +1953,6 @@
       "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
       "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
       },
@@ -2713,13 +2716,12 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.14.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz",
-      "integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==",
+      "version": "22.0.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.0.0.tgz",
+      "integrity": "sha512-VT7KSYudcPOzP5Q0wfbowyNLaVR8QWUdw+088uFWwfvpY6uCWaXpqV6ieLAu9WBcnTa7H4Z5RLK8I5t2FuOcqw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~6.11.1"
       }
     },
     "node_modules/@types/offscreencanvas": {
@@ -2781,16 +2783,16 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.16.1.tgz",
-      "integrity": "sha512-SxdPak/5bO0EnGktV05+Hq8oatjAYVY3Zh2bye9pGZy6+jwyR3LG3YKkV4YatlsgqXP28BTeVm9pqwJM96vf2A==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz",
+      "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "7.16.1",
-        "@typescript-eslint/type-utils": "7.16.1",
-        "@typescript-eslint/utils": "7.16.1",
-        "@typescript-eslint/visitor-keys": "7.16.1",
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/type-utils": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -2814,15 +2816,15 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.16.1.tgz",
-      "integrity": "sha512-u+1Qx86jfGQ5i4JjK33/FnawZRpsLxRnKzGE6EABZ40KxVT/vWsiZFEBBHjFOljmmV3MBYOHEKi0Jm9hbAOClA==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz",
+      "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.16.1",
-        "@typescript-eslint/types": "7.16.1",
-        "@typescript-eslint/typescript-estree": "7.16.1",
-        "@typescript-eslint/visitor-keys": "7.16.1",
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2842,13 +2844,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.16.1.tgz",
-      "integrity": "sha512-nYpyv6ALte18gbMz323RM+vpFpTjfNdyakbf3nsLvF43uF9KeNC289SUEW3QLZ1xPtyINJ1dIsZOuWuSRIWygw==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
+      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.16.1",
-        "@typescript-eslint/visitor-keys": "7.16.1"
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -2859,13 +2861,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.16.1.tgz",
-      "integrity": "sha512-rbu/H2MWXN4SkjIIyWcmYBjlp55VT+1G3duFOIukTNFxr9PI35pLc2ydwAfejCEitCv4uztA07q0QWanOHC7dA==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
+      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.16.1",
-        "@typescript-eslint/utils": "7.16.1",
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -2886,9 +2888,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.1.tgz",
-      "integrity": "sha512-AQn9XqCzUXd4bAVEsAXM/Izk11Wx2u4H3BAfQVhSfzfDOm/wAON9nP7J5rpkCxts7E5TELmN845xTUCQrD1xIQ==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
       "dev": true,
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -2899,13 +2901,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.1.tgz",
-      "integrity": "sha512-0vFPk8tMjj6apaAZ1HlwM8w7jbghC8jc1aRNJG5vN8Ym5miyhTQGMqU++kuBFDNKe9NcPeZ6x0zfSzV8xC1UlQ==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
+      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.16.1",
-        "@typescript-eslint/visitor-keys": "7.16.1",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -2927,15 +2929,15 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.16.1.tgz",
-      "integrity": "sha512-WrFM8nzCowV0he0RlkotGDujx78xudsxnGMBHI88l5J8wEhED6yBwaSLP99ygfrzAjsQvcYQ94quDwI0d7E1fA==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
+      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.16.1",
-        "@typescript-eslint/types": "7.16.1",
-        "@typescript-eslint/typescript-estree": "7.16.1"
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/typescript-estree": "7.18.0"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -2949,12 +2951,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.1.tgz",
-      "integrity": "sha512-Qlzzx4sE4u3FsHTPQAAQFJFNOuqtuY0LFrZHwQ8IHK705XxBiWOFkfKRWu6niB7hwfgnwIpO4jTC75ozW1PHWg==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
+      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.16.1",
+        "@typescript-eslint/types": "7.18.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -2973,25 +2975,25 @@
       "license": "ISC"
     },
     "node_modules/@vitest/browser": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@vitest/browser/-/browser-2.0.3.tgz",
-      "integrity": "sha512-PQQ89fRaFVm/ja3x92BxAXUIxdxSSuQqu9ijR1rLT8FYCBU+BTzZ7razwLmzMS8AMMaKOFoRXbLg7A2mtSzANg==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/browser/-/browser-2.0.4.tgz",
+      "integrity": "sha512-QsIkbqPqHsXvgxjCjjgKjuWKmrC0VJgpaDkuEmOy5gTnErhhifWIfp3HpH92K7cscfaIao+RlKv5f8nUMgjfmA==",
       "dev": true,
       "dependencies": {
-        "@testing-library/dom": "^10.2.0",
+        "@testing-library/dom": "^10.3.1",
         "@testing-library/user-event": "^14.5.2",
-        "@vitest/utils": "2.0.3",
+        "@vitest/utils": "2.0.4",
         "magic-string": "^0.30.10",
         "msw": "^2.3.1",
         "sirv": "^2.0.4",
-        "ws": "^8.17.1"
+        "ws": "^8.18.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
         "playwright": "*",
-        "vitest": "2.0.3",
+        "vitest": "2.0.4",
         "webdriverio": "*"
       },
       "peerDependenciesMeta": {
@@ -3028,13 +3030,13 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.0.3.tgz",
-      "integrity": "sha512-X6AepoOYePM0lDNUPsGXTxgXZAl3EXd0GYe/MZyVE4HzkUqyUVC6S3PrY5mClDJ6/7/7vALLMV3+xD/Ko60Hqg==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.0.4.tgz",
+      "integrity": "sha512-39jr5EguIoanChvBqe34I8m1hJFI4+jxvdOpD7gslZrVQBKhh8H9eD7J/LJX4zakrw23W+dITQTDqdt43xVcJw==",
       "dev": true,
       "dependencies": {
-        "@vitest/spy": "2.0.3",
-        "@vitest/utils": "2.0.3",
+        "@vitest/spy": "2.0.4",
+        "@vitest/utils": "2.0.4",
         "chai": "^5.1.1",
         "tinyrainbow": "^1.2.0"
       },
@@ -3043,9 +3045,9 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.0.3.tgz",
-      "integrity": "sha512-URM4GLsB2xD37nnTyvf6kfObFafxmycCL8un3OC9gaCs5cti2u+5rJdIflZ2fUJUen4NbvF6jCufwViAFLvz1g==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.0.4.tgz",
+      "integrity": "sha512-RYZl31STbNGqf4l2eQM1nvKPXE0NhC6Eq0suTTePc4mtMQ1Fn8qZmjV4emZdEdG2NOWGKSCrHZjmTqDCDoeFBw==",
       "dev": true,
       "dependencies": {
         "tinyrainbow": "^1.2.0"
@@ -3055,12 +3057,12 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.0.3.tgz",
-      "integrity": "sha512-EmSP4mcjYhAcuBWwqgpjR3FYVeiA4ROzRunqKltWjBfLNs1tnMLtF+qtgd5ClTwkDP6/DGlKJTNa6WxNK0bNYQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.0.4.tgz",
+      "integrity": "sha512-Gk+9Su/2H2zNfNdeJR124gZckd5st4YoSuhF1Rebi37qTXKnqYyFCd9KP4vl2cQHbtuVKjfEKrNJxHHCW8thbQ==",
       "dev": true,
       "dependencies": {
-        "@vitest/utils": "2.0.3",
+        "@vitest/utils": "2.0.4",
         "pathe": "^1.1.2"
       },
       "funding": {
@@ -3068,12 +3070,12 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.0.3.tgz",
-      "integrity": "sha512-6OyA6v65Oe3tTzoSuRPcU6kh9m+mPL1vQ2jDlPdn9IQoUxl8rXhBnfICNOC+vwxWY684Vt5UPgtcA2aPFBb6wg==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.0.4.tgz",
+      "integrity": "sha512-or6Mzoz/pD7xTvuJMFYEtso1vJo1S5u6zBTinfl+7smGUhqybn6VjzCDMhmTyVOFWwkCMuNjmNNxnyXPgKDoPw==",
       "dev": true,
       "dependencies": {
-        "@vitest/pretty-format": "2.0.3",
+        "@vitest/pretty-format": "2.0.4",
         "magic-string": "^0.30.10",
         "pathe": "^1.1.2"
       },
@@ -3082,9 +3084,9 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.0.3.tgz",
-      "integrity": "sha512-sfqyAw/ypOXlaj4S+w8689qKM1OyPOqnonqOc9T91DsoHbfN5mU7FdifWWv3MtQFf0lEUstEwR9L/q/M390C+A==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.0.4.tgz",
+      "integrity": "sha512-uTXU56TNoYrTohb+6CseP8IqNwlNdtPwEO0AWl+5j7NelS6x0xZZtP0bDWaLvOfUbaYwhhWp1guzXUxkC7mW7Q==",
       "dev": true,
       "dependencies": {
         "tinyspy": "^3.0.0"
@@ -3094,12 +3096,12 @@
       }
     },
     "node_modules/@vitest/ui": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-2.0.3.tgz",
-      "integrity": "sha512-UAkzHk5veR3NRF7BNUxWlLly7Cw7H+wzP3+eiMIVeKo3Md33Ey20rYsNQn/9McIqOeO02tMzqHhpThmjk1yRzw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-2.0.4.tgz",
+      "integrity": "sha512-9SNE9ve3kgDkVTxJsY7BjqSwyqDVRJbq/AHVHZs+V0vmr/0cCX6yGT6nOahSXEsXFtKAsvRtBXKlTgr+5njzZQ==",
       "dev": true,
       "dependencies": {
-        "@vitest/utils": "2.0.3",
+        "@vitest/utils": "2.0.4",
         "fast-glob": "^3.3.2",
         "fflate": "^0.8.2",
         "flatted": "^3.3.1",
@@ -3111,16 +3113,16 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "vitest": "2.0.3"
+        "vitest": "2.0.4"
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.0.3.tgz",
-      "integrity": "sha512-c/UdELMuHitQbbc/EVctlBaxoYAwQPQdSNwv7z/vHyBKy2edYZaFgptE27BRueZB7eW8po+cllotMNTDpL3HWg==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.0.4.tgz",
+      "integrity": "sha512-Zc75QuuoJhOBnlo99ZVUkJIuq4Oj0zAkrQ2VzCqNCx6wAwViHEh5Fnp4fiJTE9rA+sAoXRf00Z9xGgfEzV6fzQ==",
       "dev": true,
       "dependencies": {
-        "@vitest/pretty-format": "2.0.3",
+        "@vitest/pretty-format": "2.0.4",
         "estree-walker": "^3.0.3",
         "loupe": "^3.1.1",
         "tinyrainbow": "^1.2.0"
@@ -5167,11 +5169,10 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -6289,9 +6290,9 @@
       }
     },
     "node_modules/eslint-plugin-jsdoc": {
-      "version": "48.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.7.0.tgz",
-      "integrity": "sha512-5oiVf7Y+ZxGYQTlLq81X72n+S+hjvS/u0upAdbpPEeaIZILK3MKN8lm/6QqKioBjm/qZ0B5XpMQUtc2fUkqXAg==",
+      "version": "48.9.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.9.2.tgz",
+      "integrity": "sha512-ydqg2lEY/WxhMXEb1ZAn+yRbc43DlKYdMP/nUreF5ODE1P9mgeff8atL16lYNNKOvYxNOzL85/5gFVeGylSioA==",
       "dev": true,
       "dependencies": {
         "@es-joy/jsdoccomment": "~0.46.0",
@@ -6301,9 +6302,9 @@
         "escape-string-regexp": "^4.0.0",
         "esquery": "^1.6.0",
         "parse-imports": "^2.1.1",
-        "semver": "^7.6.2",
+        "semver": "^7.6.3",
         "spdx-expression-parse": "^4.0.0",
-        "synckit": "^0.9.0"
+        "synckit": "^0.9.1"
       },
       "engines": {
         "node": ">=18"
@@ -9145,6 +9146,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
     "node_modules/lodash._baseflatten": {
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz",
@@ -9177,26 +9184,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/lodash.assignin": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
-      "integrity": "sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/lodash.castarray": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz",
-      "integrity": "sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
-      "license": "MIT"
-    },
     "node_modules/lodash.debounce": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-3.1.1.tgz",
@@ -9207,13 +9194,6 @@
         "lodash._getnative": "^3.0.0"
       }
     },
-    "node_modules/lodash.find": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz",
-      "integrity": "sha512-yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/lodash.flatten": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-3.0.2.tgz",
@@ -9288,13 +9268,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/lodash.uniqby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz",
-      "integrity": "sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/loupe": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.1.tgz",
@@ -10740,13 +10713,12 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.45.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.45.1.tgz",
-      "integrity": "sha512-Hjrgae4kpSQBr98nhCj3IScxVeVUixqj+5oyif8TdIn2opTCPEzqAqNMeK42i3cWDCVu9MI+ZsGWw+gVR4ISBg==",
+      "version": "1.45.3",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.45.3.tgz",
+      "integrity": "sha512-QhVaS+lpluxCaioejDZ95l4Y4jSFCsBvl2UZkpeXlzxmqS+aABr5c82YmfMHrL6x27nvrvykJAFpkzT2eWdJww==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.45.1"
+        "playwright-core": "1.45.3"
       },
       "bin": {
         "playwright": "cli.js"
@@ -10759,11 +10731,10 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.45.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.45.1.tgz",
-      "integrity": "sha512-LF4CUUtrUu2TCpDw4mcrAIuYrEjVDfT1cHbJMfwnE2+1b8PZcFzPNgvZCvq2JfQ4aTjRCCHw5EJ2tmr2NSzdPg==",
+      "version": "1.45.3",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.45.3.tgz",
+      "integrity": "sha512-+ym0jNbcjikaOwwSZycFbwkWgfruWvYlJfThKYAlImbxUgdWFO2oW70ojPm4OpE4t6TAo2FY/smM+hpVTtkhDA==",
       "dev": true,
-      "license": "Apache-2.0",
       "bin": {
         "playwright-core": "cli.js"
       },
@@ -10807,9 +10778,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
-      "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
+      "version": "8.4.40",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz",
+      "integrity": "sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==",
       "dev": true,
       "funding": [
         {
@@ -10825,7 +10796,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.7",
         "picocolors": "^1.0.1",
@@ -11417,11 +11387,10 @@
       }
     },
     "node_modules/postcss-resolve-nested-selector": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-      "integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==",
-      "dev": true,
-      "license": "MIT"
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.4.tgz",
+      "integrity": "sha512-R6vHqZWgVnTAPq0C+xjyHfEZqfIYboCBVSy24MjxEDm+tIh1BU4O6o7DP7AA7kHzf136d+Qc5duI4tlpHjixDw==",
+      "dev": true
     },
     "node_modules/postcss-safe-parser": {
       "version": "7.0.0",
@@ -11451,11 +11420,10 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz",
-      "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz",
+      "integrity": "sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -12290,11 +12258,10 @@
       "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -13220,9 +13187,9 @@
       }
     },
     "node_modules/stylelint": {
-      "version": "16.7.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.7.0.tgz",
-      "integrity": "sha512-Q1ATiXlz+wYr37a7TGsfvqYn2nSR3T/isw3IWlZQzFzCNoACHuGBb6xBplZXz56/uDRJHIygxjh7jbV/8isewA==",
+      "version": "16.8.0",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.8.0.tgz",
+      "integrity": "sha512-Jjr40w3PXDiJVW6c9swLM0a1e0DgDm/XkFozc4XgAcREFas+/nchzmDmeVxazbzXgpDrwm+cW6W6iGtZqYUh+g==",
       "dev": true,
       "funding": [
         {
@@ -13245,7 +13212,7 @@
         "cosmiconfig": "^9.0.0",
         "css-functions-list": "^3.2.2",
         "css-tree": "^2.3.1",
-        "debug": "^4.3.5",
+        "debug": "^4.3.6",
         "fast-glob": "^3.3.2",
         "fastest-levenshtein": "^1.0.16",
         "file-entry-cache": "^9.0.0",
@@ -13262,10 +13229,10 @@
         "micromatch": "^4.0.7",
         "normalize-path": "^3.0.0",
         "picocolors": "^1.0.1",
-        "postcss": "^8.4.39",
-        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss": "^8.4.40",
+        "postcss-resolve-nested-selector": "^0.1.4",
         "postcss-safe-parser": "^7.0.0",
-        "postcss-selector-parser": "^6.1.0",
+        "postcss-selector-parser": "^6.1.1",
         "postcss-value-parser": "^4.2.0",
         "resolve-from": "^5.0.0",
         "string-width": "^4.2.3",
@@ -13531,11 +13498,10 @@
       }
     },
     "node_modules/synckit": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.0.tgz",
-      "integrity": "sha512-7RnqIMq572L8PeEzKeBINYEJDDxpcH8JEgLwUqBd3TkofhFRbkq4QLR0u+36avGAhCRbk2nnmjcW9SE531hPDg==",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz",
+      "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@pkgr/core": "^0.1.0",
         "tslib": "^2.6.2"
@@ -13825,11 +13791,10 @@
       "license": "MIT"
     },
     "node_modules/testem": {
-      "version": "3.15.0",
-      "resolved": "https://registry.npmjs.org/testem/-/testem-3.15.0.tgz",
-      "integrity": "sha512-vI1oQsjJW4QdVaH6ZmfNErzH7nzs0KzHJluocnfvbz1XRYGJKkIMGKWfsbD8MGGJOg+uzXcEek0/2W7BmGR4ug==",
+      "version": "3.15.1",
+      "resolved": "https://registry.npmjs.org/testem/-/testem-3.15.1.tgz",
+      "integrity": "sha512-532OJy6VVsnDFEGZBdWVywvceNWdjdxJruC6qCDzLH586+eh1duWk5ju6QSRqQdP6gZB7zNiUJU9dSQdHPzFuA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@xmldom/xmldom": "^0.8.0",
         "backbone": "^1.1.2",
@@ -13844,11 +13809,7 @@
         "glob": "^7.0.4",
         "http-proxy": "^1.13.1",
         "js-yaml": "^3.2.5",
-        "lodash.assignin": "^4.1.0",
-        "lodash.castarray": "^4.4.0",
-        "lodash.clonedeep": "^4.4.1",
-        "lodash.find": "^4.5.1",
-        "lodash.uniqby": "^4.7.0",
+        "lodash": "^4.17.21",
         "mkdirp": "^3.0.1",
         "mustache": "^4.2.0",
         "node-notifier": "^10.0.0",
@@ -14112,8 +14073,7 @@
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
       "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
-      "dev": true,
-      "license": "0BSD"
+      "dev": true
     },
     "node_modules/tsx": {
       "version": "4.16.2",
@@ -14706,11 +14666,10 @@
       "license": "MIT"
     },
     "node_modules/typescript": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
-      "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
       "dev": true,
-      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -14720,14 +14679,14 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-7.16.1.tgz",
-      "integrity": "sha512-889oE5qELj65q/tGeOSvlreNKhimitFwZqQ0o7PcWC7/lgRkAMknznsCsV8J8mZGTP/Z+cIbX8accf2DE33hrA==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-7.18.0.tgz",
+      "integrity": "sha512-PonBkP603E3tt05lDkbOMyaxJjvKqQrXsnow72sVeOFINDE/qNmnnd+f9b4N+U7W6MXnnYyrhtmF2t08QWwUbA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "7.16.1",
-        "@typescript-eslint/parser": "7.16.1",
-        "@typescript-eslint/utils": "7.16.1"
+        "@typescript-eslint/eslint-plugin": "7.18.0",
+        "@typescript-eslint/parser": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -14806,11 +14765,10 @@
       "license": "MIT"
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true,
-      "license": "MIT"
+      "version": "6.11.1",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.11.1.tgz",
+      "integrity": "sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ==",
+      "dev": true
     },
     "node_modules/unicorn-magic": {
       "version": "0.1.0",
@@ -15015,9 +14973,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.3.tgz",
-      "integrity": "sha512-NPQdeCU0Dv2z5fu+ULotpuq5yfCS1BzKUIPhNbP3YBfAMGJXbt2nS+sbTFu+qchaqWTD+H3JK++nRwr6XIcp6A==",
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.4.tgz",
+      "integrity": "sha512-Cw+7zL3ZG9/NZBB8C+8QbQZmR54GwqIz+WMI4b3JgdYJvX+ny9AjJXqkGQlDXSXRP9rP0B4tbciRMOVEKulVOA==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.21.3",
@@ -15070,9 +15028,9 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.0.3.tgz",
-      "integrity": "sha512-14jzwMx7XTcMB+9BhGQyoEAmSl0eOr3nrnn+Z12WNERtOvLN+d2scbRUvyni05rT3997Bg+rZb47NyP4IQPKXg==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.0.4.tgz",
+      "integrity": "sha512-ZpJVkxcakYtig5iakNeL7N3trufe3M6vGuzYAr4GsbCTwobDeyPJpE4cjDhhPluv8OvQCFzu2LWp6GkoKRITXA==",
       "dev": true,
       "dependencies": {
         "cac": "^6.7.14",
@@ -15505,18 +15463,18 @@
       }
     },
     "node_modules/vitest": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.0.3.tgz",
-      "integrity": "sha512-o3HRvU93q6qZK4rI2JrhKyZMMuxg/JRt30E6qeQs6ueaiz5hr1cPj+Sk2kATgQzMMqsa2DiNI0TIK++1ULx8Jw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.0.4.tgz",
+      "integrity": "sha512-luNLDpfsnxw5QSW4bISPe6tkxVvv5wn2BBs/PuDRkhXZ319doZyLOBr1sjfB5yCEpTiU7xCAdViM8TNVGPwoog==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.3.0",
-        "@vitest/expect": "2.0.3",
-        "@vitest/pretty-format": "^2.0.3",
-        "@vitest/runner": "2.0.3",
-        "@vitest/snapshot": "2.0.3",
-        "@vitest/spy": "2.0.3",
-        "@vitest/utils": "2.0.3",
+        "@vitest/expect": "2.0.4",
+        "@vitest/pretty-format": "^2.0.4",
+        "@vitest/runner": "2.0.4",
+        "@vitest/snapshot": "2.0.4",
+        "@vitest/spy": "2.0.4",
+        "@vitest/utils": "2.0.4",
         "chai": "^5.1.1",
         "debug": "^4.3.5",
         "execa": "^8.0.1",
@@ -15527,8 +15485,8 @@
         "tinypool": "^1.0.0",
         "tinyrainbow": "^1.2.0",
         "vite": "^5.0.0",
-        "vite-node": "2.0.3",
-        "why-is-node-running": "^2.2.2"
+        "vite-node": "2.0.4",
+        "why-is-node-running": "^2.3.0"
       },
       "bin": {
         "vitest": "vitest.mjs"
@@ -15542,8 +15500,8 @@
       "peerDependencies": {
         "@edge-runtime/vm": "*",
         "@types/node": "^18.0.0 || >=20.0.0",
-        "@vitest/browser": "2.0.3",
-        "@vitest/ui": "2.0.3",
+        "@vitest/browser": "2.0.4",
+        "@vitest/ui": "2.0.4",
         "happy-dom": "*",
         "jsdom": "*"
       },
@@ -16066,7 +16024,7 @@
     },
     "src/style-spec": {
       "name": "@mapbox/mapbox-gl-style-spec",
-      "version": "14.5.2",
+      "version": "14.6.0-beta.1",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@mapbox/jsonlint-lines-primitives": "~2.0.2",
@@ -16094,7 +16052,7 @@
       },
       "devDependencies": {
         "@types/geojson": "*",
-        "typescript": "^5.4.5"
+        "typescript": "^5.5.4"
       }
     }
   }
diff --git a/package.json b/package.json
index bb0ebb2e66f..27d65f2740c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mapbox-gl",
   "description": "A WebGL interactive maps library",
-  "version": "3.5.2",
+  "version": "3.6.0-beta.1",
   "main": "dist/mapbox-gl.js",
   "style": "dist/mapbox-gl.css",
   "types": "dist/mapbox-gl.d.ts",
@@ -33,7 +33,6 @@
     "gl-matrix": "^3.4.3",
     "grid-index": "^1.1.0",
     "kdbush": "^4.0.2",
-    "lodash.clonedeep": "^4.5.0",
     "murmurhash-js": "^1.0.0",
     "pbf": "^3.2.1",
     "potpack": "^2.0.0",
@@ -48,7 +47,7 @@
   },
   "devDependencies": {
     "@mapbox/mvt-fixtures": "^3.10.0",
-    "@octokit/rest": "^21.0.0",
+    "@octokit/rest": "^21.0.1",
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
@@ -59,12 +58,12 @@
     "@types/geojson-vt": "^3.2.5",
     "@types/jest": "^29.5.12",
     "@types/mapbox__point-geometry": "^0.1.4",
-    "@types/node": "^20.14.10",
+    "@types/node": "^22.0.0",
     "@types/offscreencanvas": "^2019.7.3",
     "@types/pbf": "^3.0.5",
-    "@typescript-eslint/eslint-plugin": "^7.16.1",
-    "@typescript-eslint/parser": "^7.16.1",
-    "@vitest/browser": "^2.0.3",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
+    "@vitest/browser": "^2.0.4",
     "@vitest/ui": "^2.0.3",
     "address": "^2.0.3",
     "browserify": "^17.0.0",
@@ -83,7 +82,7 @@
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-html": "^8.1.1",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsdoc": "^48.7.0",
+    "eslint-plugin-jsdoc": "^48.9.2",
     "glob": "^11.0.0",
     "is-builtin-module": "^4.0.0",
     "jest-extended": "^4.0.2",
@@ -97,8 +96,8 @@
     "npm-font-open-sans": "^1.1.0",
     "npm-run-all": "^4.1.5",
     "pixelmatch": "^6.0.0",
-    "playwright": "^1.45.1",
-    "postcss": "^8.4.39",
+    "playwright": "^1.45.3",
+    "postcss": "^8.4.40",
     "postcss-cli": "^11.0.0",
     "postcss-inline-svg": "^6.0.0",
     "pretty-bytes": "^6.0.0",
@@ -109,14 +108,14 @@
     "serve-static": "^1.15.0",
     "shuffle-seed": "^1.1.6",
     "st": "^3.0.0",
-    "stylelint": "^16.7.0",
+    "stylelint": "^16.8.0",
     "stylelint-config-standard": "^36.0.1",
     "tape": "^5.8.1",
     "tape-filter": "^1.0.4",
-    "testem": "^3.15.0",
+    "testem": "^3.15.1",
     "tsx": "^4.16.2",
-    "typescript": "^5.5.3",
-    "typescript-eslint": "^7.16.1",
+    "typescript": "^5.5.4",
+    "typescript-eslint": "^7.18.0",
     "utility-types": "^3.11.0",
     "vite-plugin-arraybuffer": "^0.0.8",
     "vitest": "^2.0.3"
diff --git a/src/shaders/circle.fragment.glsl b/src/shaders/circle.fragment.glsl
index 1cc124f5f3a..289ececafe2 100644
--- a/src/shaders/circle.fragment.glsl
+++ b/src/shaders/circle.fragment.glsl
@@ -23,12 +23,12 @@ void main() {
     #pragma mapbox: initialize mediump float stroke_width
     #pragma mapbox: initialize lowp float stroke_opacity
     vec2 extrude = v_data.xy;
-    float extrude_length = length(extrude);
-
+    float blur_positive = blur < 0.0 ? 0.0 : 1.0;
     lowp float antialiasblur = v_data.z;
-    float antialiased_blur = -max(blur, antialiasblur);
+    float extrude_length = length(extrude) + antialiasblur * (1.0 - blur_positive);
+    float antialiased_blur = -max(abs(blur), antialiasblur);
 
-    float opacity_t = smoothstep(0.0, antialiased_blur, extrude_length - 1.0);
+    float opacity_t = smoothstep((1.0 - blur_positive) * antialiased_blur, blur_positive * antialiased_blur, extrude_length - 1.0) - smoothstep(0.0, antialiasblur, extrude_length - 1.0);
 
     float color_t = stroke_width < 0.01 ? 0.0 : smoothstep(
         antialiased_blur,
diff --git a/src/source/geojson_source.ts b/src/source/geojson_source.ts
index 63aaf937ac1..4a70d00be6c 100644
--- a/src/source/geojson_source.ts
+++ b/src/source/geojson_source.ts
@@ -6,7 +6,7 @@ import {ResourceType} from '../util/ajax';
 import browser from '../util/browser';
 
 import type {ISource, SourceEvents} from './source';
-import type {Map} from '../ui/map';
+import type {Map as MapboxMap} from '../ui/map';
 import type Dispatcher from '../util/dispatcher';
 import type Tile from './tile';
 import type Actor from '../util/actor';
@@ -81,7 +81,7 @@ class GeoJSONSource extends Evented<SourceEvents> implements ISource {
     _data: GeoJSON.GeoJSON | string;
     _options: GeoJSONSourceSpecification;
     workerOptions: GeoJSONWorkerOptions;
-    map: Map;
+    map: MapboxMap;
     actor: Actor;
     _loaded: boolean;
     _coalesce: boolean | null | undefined;
@@ -164,7 +164,7 @@ class GeoJSONSource extends Evented<SourceEvents> implements ISource {
         }, options.workerOptions);
     }
 
-    onAdd(map: Map) {
+    onAdd(map: MapboxMap) {
         this.map = map;
         this.setData(this._data);
     }
@@ -242,7 +242,11 @@ class GeoJSONSource extends Evented<SourceEvents> implements ISource {
         }
         // if there's a pending load, accummulate feature updates
         if (this._coalesce && typeof data !== 'string' && typeof this._data !== 'string' && this._data.type === 'FeatureCollection') {
-            this._data.features.push(...data.features);
+            // merge features by ID to avoid accummulating duplicate features to update
+            const featuresById = new Map();
+            for (const feature of this._data.features) featuresById.set(feature.id, feature);
+            for (const feature of data.features) featuresById.set(feature.id, feature);
+            this._data.features = [...featuresById.values()];
         } else {
             this._data = data;
         }
@@ -484,7 +488,7 @@ class GeoJSONSource extends Evented<SourceEvents> implements ISource {
         tile.destroy();
     }
 
-    onRemove(_: Map) {
+    onRemove(_: MapboxMap) {
         if (this._pendingLoad) {
             this._pendingLoad.cancel();
         }
diff --git a/src/source/load_tilejson.ts b/src/source/load_tilejson.ts
index faf45dfc553..da5bb66d210 100644
--- a/src/source/load_tilejson.ts
+++ b/src/source/load_tilejson.ts
@@ -18,7 +18,56 @@ type ExtendedTileJSON = TileJSON & {
 };
 
 type TileJSONLike = {url?: string, tiles?: Array<string>};
-type Options = Extract<SourceSpecification, TileJSONLike> & TileJSONLike;
+type Options = Extract<SourceSpecification, TileJSONLike> & TileJSONLike & {
+    data?: TileJSON
+};
+
+function getInlinedTileJSON(data?: TileJSON, language?: string, worldview?: string): TileJSON | undefined | null {
+    if (!data) {
+        return null;
+    }
+
+    if (!language && !worldview) {
+        return data;
+    }
+
+    worldview = worldview || data.worldview_default;
+
+    const tileJSONLanguages = Object.values(data.language || {});
+
+    if (tileJSONLanguages.length === 0) {
+        return null;
+    }
+
+    const tileJSONWorldviews = Object.values(data.worldview || {});
+
+    if (tileJSONWorldviews.length === 0) {
+        return null;
+    }
+
+    const isLanguageMatched = tileJSONLanguages.every(lang => lang === language);
+    const isWorldviewMatched = tileJSONWorldviews.every(vw => vw === worldview);
+
+    if (isLanguageMatched && isWorldviewMatched) {
+        return data;
+    }
+
+    // If we don't support this language and worldview in TileJSON
+    // or in the same time some of them is not defined
+    // we can safely use inlined default
+    if (!(language in (data.language_options || {})) && !(worldview in (data.worldview_options || {}))) {
+        // There is exception for empty language or worldview options:
+        // If we don't have any language or worldview options
+        // we should always request TileJSON
+        if (!data.language_options || !data.worldview_options) {
+            return null;
+        }
+
+        return data;
+    }
+
+    return null;
+}
 
 export default function(
     options: Options,
@@ -75,10 +124,19 @@ export default function(
         }
     };
 
+    const inlinedTileJSON = getInlinedTileJSON(options.data, language, worldview);
+
+    if (inlinedTileJSON) {
+        return browser.frame(() => loaded(null, inlinedTileJSON));
+    }
+
     if (options.url) {
         // @ts-expect-error - TS2345 - Argument of type 'string' is not assignable to parameter of type '"Unknown" | "Style" | "Source" | "Tile" | "Glyphs" | "SpriteImage" | "SpriteJSON" | "Image" | "Model"'.
         return getJSON(requestManager.transformRequest(requestManager.normalizeSourceURL(options.url, null, language, worldview), ResourceType.Source), loaded);
     } else {
-        return browser.frame(() => loaded(null, options));
+        return browser.frame(() => {
+            const {data, ...tileJSON} = options;
+            loaded(null, tileJSON);
+        });
     }
 }
diff --git a/src/source/load_vector_tile.ts b/src/source/load_vector_tile.ts
index 8563f5cfb03..fb91984a7bc 100644
--- a/src/source/load_vector_tile.ts
+++ b/src/source/load_vector_tile.ts
@@ -1,10 +1,7 @@
-// @ts-expect-error - TS2300 - Duplicate identifier 'VectorTile'.
 import {VectorTile} from '@mapbox/vector-tile';
 import Protobuf from 'pbf';
 import {getArrayBuffer} from '../util/ajax';
 
-// @ts-expect-error - TS2300 - Duplicate identifier 'VectorTile'.
-import type {VectorTile} from '@mapbox/vector-tile';
 import type {Callback} from '../types/callback';
 import type {RequestedTileParameters} from './worker_source';
 import type Scheduler from '../util/scheduler';
diff --git a/src/source/query_features.ts b/src/source/query_features.ts
index 959f8343b03..d87e613b7d6 100644
--- a/src/source/query_features.ts
+++ b/src/source/query_features.ts
@@ -191,7 +191,7 @@ export function queryRenderedSymbols(
 
 export function querySourceFeatures(sourceCache: SourceCache, params?: {
     sourceLayer?: string;
-    filter?: FilterSpecification | ExpressionSpecification;
+    filter?: FilterSpecification;
     validate?: boolean;
 }): Array<GeoJSONFeature> {
     const tiles = sourceCache.getRenderableIds().map((id) => {
diff --git a/src/source/raster_array_tile_source.ts b/src/source/raster_array_tile_source.ts
index f578ac91ce0..d90b826617c 100644
--- a/src/source/raster_array_tile_source.ts
+++ b/src/source/raster_array_tile_source.ts
@@ -19,6 +19,20 @@ import type {TextureDescriptor} from './raster_array_tile';
 import type {ISource, SourceRasterLayer} from './source';
 import type {RasterArraySourceSpecification} from '../style-spec/types';
 
+/**
+ * A data source containing raster-array tiles created with [Mapbox Tiling Service](https://docs.mapbox.com/mapbox-tiling-service/guides/).
+ * See the [Style Specification](https://docs.mapbox.com/style-spec/reference/sources/#raster-array) for detailed documentation of options.
+ *
+ * @example
+ * // add to map
+ * map.addSource('some id', {
+ *     type: 'raster-array',
+ *     url: 'mapbox://rasterarrayexamples.gfs-winds',
+ *     tileSize: 512
+ * });
+ *
+ * @see [Example: Create a wind particle animation](https://docs.mapbox.com/mapbox-gl-js/example/raster-particle-layer/)
+ */
 class RasterArrayTileSource extends RasterTileSource<'raster-array'> implements ISource {
     type: 'raster-array';
     map: Map;
diff --git a/src/source/source_cache.ts b/src/source/source_cache.ts
index baf5128d8bc..ce13f6ec0b2 100644
--- a/src/source/source_cache.ts
+++ b/src/source/source_cache.ts
@@ -1,16 +1,19 @@
+import assert from 'assert';
+import Point from '@mapbox/point-geometry';
+
 import Tile from './tile';
 import RasterArrayTile from './raster_array_tile';
 import {Event, ErrorEvent, Evented} from '../util/evented';
 import TileCache from './tile_cache';
 import {asyncAll, keysDifference, values, clamp} from '../util/util';
 import Context from '../gl/context';
-import Point from '@mapbox/point-geometry';
 import browser from '../util/browser';
 import {OverscaledTileID, CanonicalTileID} from './tile_id';
-import assert from 'assert';
 import SourceFeatureState from './source_state';
 import {mercatorXfromLng} from '../geo/mercator_coordinate';
 
+import type {vec3} from 'gl-matrix';
+import type {AJAXError} from '../util/ajax';
 import type {ISource, Source} from './source';
 import type {SourceSpecification} from '../style-spec/types';
 import type {Map as MapboxMap} from '../ui/map';
@@ -19,7 +22,6 @@ import type {TileState} from './tile';
 import type {Callback} from '../types/callback';
 import type {FeatureState} from '../style-spec/expression/index';
 import type {QueryGeometry, TilespaceQueryGeometry} from '../style/query_geometry';
-import type {vec3} from 'gl-matrix';
 
 /**
  * `SourceCache` is responsible for
@@ -128,7 +130,7 @@ class SourceCache extends Evented {
         if (!this._source.loaded()) { return false; }
         for (const t in this._tiles) {
             const tile = this._tiles[t];
-            if (tile.state !== 'errored' && (tile.state !== 'loaded' || !tile.bucketsLoaded()))
+            if (tile.state !== 'loaded' && tile.state !== 'errored')
                 return false;
         }
         return true;
@@ -256,21 +258,19 @@ class SourceCache extends Evented {
         this._loadTile(tile, this._tileLoaded.bind(this, tile, id, state));
     }
 
-    _tileLoaded(tile: Tile, id: number, previousState: TileState, err?: Error | null) {
+    _tileLoaded(tile: Tile, id: number, previousState: TileState, err?: AJAXError | null) {
         if (err) {
             tile.state = 'errored';
-            if ((err as any).status !== 404) this._source.fire(new ErrorEvent(err, {tile}));
+            if (err.status !== 404) this._source.fire(new ErrorEvent(err, {tile}));
             // If the requested tile is missing, try to load the parent tile
             // to use it as an overscaled tile instead of the missing one.
             else {
+                // Fire a `data` event with an `error` source data type to trigger map render
+                this._source.fire(new Event('data', {dataType: 'source', sourceDataType: 'error', sourceId: this._source.id, tile}));
+
+                // If there are no parent tiles to load, stop tiles loading fallback
                 const hasParent = tile.tileID.key in this._loadedParentTiles;
-                // If there are no parent tiles to load, fire a `data` event to trigger map render
-                if (!hasParent) {
-                    // We are firing an `error` source type event instead of `content` here because
-                    // the `content` event will reload all tiles and trigger redundant source cache updates
-                    this._source.fire(new Event('data', {dataType: 'source', sourceDataType: 'error', sourceId: this._source.id}));
-                    return;
-                }
+                if (!hasParent) return;
 
                 // Otherwise, continue trying to load the parent tile until we find one that loads successfully
                 const updateForTerrain = this._source.type === 'raster-dem' && this.usedForTerrain;
diff --git a/src/source/tile.ts b/src/source/tile.ts
index ec2c7efa8a4..bfabc35f850 100644
--- a/src/source/tile.ts
+++ b/src/source/tile.ts
@@ -483,7 +483,7 @@ class Tile {
 
     querySourceFeatures(result: Array<GeoJSONFeature>, params?: {
         sourceLayer?: string;
-        filter?: FilterSpecification | ExpressionSpecification;
+        filter?: FilterSpecification;
         validate?: boolean;
     }) {
         const featureIndex = this.latestFeatureIndex;
@@ -522,15 +522,6 @@ class Tile {
         return this.state === 'loaded' || this.state === 'reloading' || this.state === 'expired';
     }
 
-    bucketsLoaded(): boolean {
-        for (const id in this.buckets) {
-            if (this.buckets[id].uploadPending())
-                return false;
-        }
-
-        return true;
-    }
-
     patternsLoaded(): boolean {
         return !!this.imageAtlas && !!Object.keys(this.imageAtlas.patternPositions).length;
     }
diff --git a/src/style-spec/expression/definitions/assertion.ts b/src/style-spec/expression/definitions/assertion.ts
index 2d3da26dfb5..26dc8f3c159 100644
--- a/src/style-spec/expression/definitions/assertion.ts
+++ b/src/style-spec/expression/definitions/assertion.ts
@@ -34,9 +34,8 @@ class Assertion implements Expression {
         this.args = args;
     }
 
-    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | null | undefined {
+    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | void {
         if (args.length < 2)
-        // @ts-expect-error - TS2322 - Type 'void' is not assignable to type 'Expression'.
             return context.error(`Expected at least one argument.`);
 
         let i = 1;
@@ -48,7 +47,6 @@ class Assertion implements Expression {
             if (args.length > 2) {
                 const type = args[1];
                 if (typeof type !== 'string' || !(type in types) || type === 'object')
-                // @ts-expect-error - TS2322 - Type 'void' is not assignable to type 'Expression'.
                     return context.error('The item type argument of "array" must be one of string, number, boolean', 1);
                 itemType = types[type];
                 i++;
@@ -63,7 +61,6 @@ class Assertion implements Expression {
                         args[2] < 0 ||
                         args[2] !== Math.floor(args[2]))
                 ) {
-                    // @ts-expect-error - TS2322 - Type 'void' is not assignable to type 'Expression'.
                     return context.error('The length argument to "array" must be a positive integer literal', 2);
                 }
                 N = (args[2] as number);
@@ -93,7 +90,7 @@ class Assertion implements Expression {
             if (!error) {
                 return value;
             } else if (i === this.args.length - 1) {
-                throw new RuntimeError(`Expected value to be of type ${toString(this.type)}, but found ${toString(typeOf(value))} instead.`);
+                throw new RuntimeError(`The expression ${JSON.stringify(this.args[i].serialize())} evaluated to ${toString(typeOf(value))} but was expected to be of type ${toString(this.type)}.`);
             }
         }
 
diff --git a/src/style-spec/expression/index.ts b/src/style-spec/expression/index.ts
index a011a1397fa..92ffcc593fb 100644
--- a/src/style-spec/expression/index.ts
+++ b/src/style-spec/expression/index.ts
@@ -133,7 +133,7 @@ export class StyleExpression {
             if (!this._warningHistory[e.message]) {
                 this._warningHistory[e.message] = true;
                 if (typeof console !== 'undefined') {
-                    console.warn(e.message);
+                    console.warn(`Failed to evaluate expression "${JSON.stringify(this.expression.serialize())}". ${e.message}`);
                 }
             }
             return this._defaultValue;
@@ -178,7 +178,7 @@ export function createExpression(
 export class ZoomConstantExpression<Kind extends EvaluationKind> {
     kind: Kind;
     isStateDependent: boolean;
-    isConfigDependent: boolean;
+    configDependencies: Set<string>;
     _styleExpression: StyleExpression;
     isLightConstant: boolean | null | undefined;
 
@@ -187,7 +187,7 @@ export class ZoomConstantExpression<Kind extends EvaluationKind> {
         this._styleExpression = expression;
         this.isLightConstant = isLightConstant;
         this.isStateDependent = kind !== ('constant' as EvaluationKind) && !isConstant.isStateConstant(expression.expression);
-        this.isConfigDependent = !isConstant.isConfigConstant(expression.expression);
+        this.configDependencies = isConstant.getConfigDependencies(expression.expression);
     }
 
     evaluateWithoutErrorHandling(
@@ -218,7 +218,7 @@ export class ZoomDependentExpression<Kind extends EvaluationKind> {
     zoomStops: Array<number>;
     isStateDependent: boolean;
     isLightConstant: boolean | null | undefined;
-    isConfigDependent: boolean;
+    configDependencies: Set<string>;
 
     _styleExpression: StyleExpression;
     interpolationType: InterpolationType | null | undefined;
@@ -229,7 +229,7 @@ export class ZoomDependentExpression<Kind extends EvaluationKind> {
         this._styleExpression = expression;
         this.isStateDependent = kind !== ('camera' as EvaluationKind) && !isConstant.isStateConstant(expression.expression);
         this.isLightConstant = isLightConstant;
-        this.isConfigDependent = !isConstant.isConfigConstant(expression.expression);
+        this.configDependencies = isConstant.getConfigDependencies(expression.expression);
         this.interpolationType = interpolationType;
     }
 
@@ -266,7 +266,7 @@ export class ZoomDependentExpression<Kind extends EvaluationKind> {
 
 export type ConstantExpression = {
     kind: 'constant';
-    isConfigDependent: boolean;
+    configDependencies: Set<string>;
     readonly evaluate: (
         globals: GlobalProperties,
         feature?: Feature,
@@ -280,7 +280,7 @@ export type SourceExpression = {
     kind: 'source';
     isStateDependent: boolean;
     isLightConstant: boolean | null | undefined;
-    isConfigDependent: boolean;
+    configDependencies: Set<string>;
     readonly evaluate: (
         globals: GlobalProperties,
         feature?: Feature,
@@ -294,7 +294,7 @@ export type SourceExpression = {
 export type CameraExpression = {
     kind: 'camera';
     isStateDependent: boolean;
-    isConfigDependent: boolean;
+    configDependencies: Set<string>;
     readonly evaluate: (
         globals: GlobalProperties,
         feature?: Feature,
@@ -311,7 +311,7 @@ export interface CompositeExpression {
     kind: 'composite';
     isStateDependent: boolean;
     isLightConstant: boolean | null | undefined;
-    isConfigDependent: boolean;
+    configDependencies: Set<string>;
     readonly evaluate: (
         globals: GlobalProperties,
         feature?: Feature,
@@ -449,7 +449,7 @@ export function normalizePropertyExpression<T>(
         }
         return {
             kind: 'constant',
-            isConfigDependent: false,
+            configDependencies: new Set(),
             evaluate: () => constant
         };
     }
diff --git a/src/style-spec/expression/is_constant.ts b/src/style-spec/expression/is_constant.ts
index edddacca52c..a2b1a94db26 100644
--- a/src/style-spec/expression/is_constant.ts
+++ b/src/style-spec/expression/is_constant.ts
@@ -51,14 +51,15 @@ function isStateConstant(e: Expression): boolean {
     return result;
 }
 
-function isConfigConstant(e: Expression): boolean {
+function getConfigDependencies(e: Expression): Set<string> {
     if (e instanceof Config) {
-        return false;
+        const singleConfig = new Set([e.key]);
+        return singleConfig;
     }
 
-    let result = true;
+    let result = new Set<string>();
     e.eachChild(arg => {
-        if (result && !isConfigConstant(arg)) { result = false; }
+        result = new Set([...result, ...getConfigDependencies(arg)]);
     });
     return result;
 }
@@ -72,4 +73,4 @@ function isGlobalPropertyConstant(e: Expression, properties: Array<string>): boo
     return result;
 }
 
-export {isFeatureConstant, isGlobalPropertyConstant, isStateConstant, isConfigConstant};
+export {isFeatureConstant, isGlobalPropertyConstant, isStateConstant, getConfigDependencies};
diff --git a/src/style-spec/feature_filter/convert.ts b/src/style-spec/feature_filter/convert.ts
index 0854283d3df..4243233e4fa 100644
--- a/src/style-spec/feature_filter/convert.ts
+++ b/src/style-spec/feature_filter/convert.ts
@@ -91,18 +91,18 @@ function _convertFilter(filter: FilterSpecification, expectedTypes: ExpectedType
         });
         return ['any'].concat(children);
     } else if (op === 'all') {
-        const children = (filter as any).slice(1).map(f => _convertFilter(f, expectedTypes));
+        const children: any[] = (filter).slice(1).map(f => _convertFilter(f, expectedTypes));
         return children.length > 1 ? ['all'].concat(children) : [].concat(...children);
     } else if (op === 'none') {
-        return ['!', _convertFilter(['any'].concat((filter as any).slice(1)), {})];
+        return ['!', _convertFilter(['any'].concat((filter).slice(1)), {})];
     } else if (op === 'in') {
-        converted = convertInOp((filter[1] as any), filter.slice(2));
+        converted = convertInOp((filter[1]), filter.slice(2));
     } else if (op === '!in') {
-        converted = convertInOp((filter[1] as any), filter.slice(2), true);
+        converted = convertInOp((filter[1]), filter.slice(2), true);
     } else if (op === 'has') {
-        converted = convertHasOp((filter[1] as any));
+        converted = convertHasOp((filter[1]));
     } else if (op === '!has') {
-        converted = ['!', convertHasOp((filter[1] as any))];
+        converted = ['!', convertHasOp((filter[1]))];
     } else {
         converted = true;
     }
@@ -164,7 +164,7 @@ function convertComparisonOp(property: string, value: any, op: string, expectedT
 function convertInOp(property: string, values: Array<any>, negate: boolean = false) {
     if (values.length === 0) return negate;
 
-    let get;
+    let get: string[];
     if (property === '$type') {
         get = ['geometry-type'];
     } else if (property === '$id') {
@@ -192,9 +192,8 @@ function convertInOp(property: string, values: Array<any>, negate: boolean = fal
         return ['match', get, uniqueValues, !negate, negate];
     }
 
-    return [ negate ? 'all' : 'any' ].concat(
-        // @ts-expect-error - TS2769 - No overload matches this call.
-        values.map(v => [negate ? '!=' : '==', get, v])
+    return [negate ? 'all' : 'any'].concat(
+        values.map(v => [negate ? '!=' : '==', get, v]) as any[]
     );
 }
 
diff --git a/src/style-spec/feature_filter/index.ts b/src/style-spec/feature_filter/index.ts
index a04d6cffcd2..eefc8e34eed 100644
--- a/src/style-spec/feature_filter/index.ts
+++ b/src/style-spec/feature_filter/index.ts
@@ -82,7 +82,7 @@ function isExpressionFilter(filter: unknown): boolean {
  * @param {string} layerType the type of the layer this filter will be applied to.
  * @returns {Function} filter-evaluating function
  */
-function createFilter(filter?: FilterSpecification | ExpressionSpecification, layerType: string = 'fill'): FeatureFilter {
+function createFilter(filter?: FilterSpecification, layerType: string = 'fill'): FeatureFilter {
     if (filter === null || filter === undefined) {
         return {filter: () => true, needGeometry: false, needFeature: false};
     }
diff --git a/src/style-spec/package.json b/src/style-spec/package.json
index 0ba8b265304..05318bf41a3 100644
--- a/src/style-spec/package.json
+++ b/src/style-spec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mapbox/mapbox-gl-style-spec",
-  "version": "14.5.2",
+  "version": "14.6.0-beta.1",
   "description": "a specification for mapbox gl styles",
   "author": "Mapbox",
   "license": "SEE LICENSE IN LICENSE.txt",
diff --git a/src/style-spec/reference/v8.json b/src/style-spec/reference/v8.json
index 99727a24c97..0b64429088e 100644
--- a/src/style-spec/reference/v8.json
+++ b/src/style-spec/reference/v8.json
@@ -6574,7 +6574,7 @@
     "circle-blur": {
       "type": "number",
       "default": 0,
-      "doc": "Amount to blur the circle. 1 blurs the circle such that only the centerpoint is full opacity.",
+      "doc": "Amount to blur the circle. 1 blurs the circle such that only the centerpoint is full opacity. Setting a negative value renders the blur as an inner glow effect.",
       "transition": true,
       "sdk-support": {
         "basic functionality": {
diff --git a/src/style-spec/types.ts b/src/style-spec/types.ts
index 0f18b191f13..cef2672e5ce 100644
--- a/src/style-spec/types.ts
+++ b/src/style-spec/types.ts
@@ -10,6 +10,7 @@ export type ResolvedImageSpecification = string;
 export type PromoteIdSpecification = {[_: string]: string} | string;
 
 export type FilterSpecification =
+    | ExpressionSpecification
     | ['has', string]
     | ['!has', string]
     | ['==', string, string | number | boolean]
diff --git a/src/style/properties.ts b/src/style/properties.ts
index dec2de28b17..5840eaab7aa 100644
--- a/src/style/properties.ts
+++ b/src/style/properties.ts
@@ -178,14 +178,14 @@ export class Transitionable<Props extends {[Key in keyof Props]: Props[Key]}> {
     _values: TransitionablePropertyValues<Props>;
     _scope: string | null | undefined;
     _options: ConfigOptions | null | undefined;
-    isConfigDependent: boolean;
+    configDependencies: Set<string>;
 
     constructor(properties: Properties<Props>, scope?: string | null, options?: ConfigOptions | null) {
         this._properties = properties;
         this._values = (Object.create(properties.defaultTransitionablePropertyValues));
         this._scope = scope;
         this._options = options;
-        this.isConfigDependent = false;
+        this.configDependencies = new Set();
     }
 
     getValue<S extends keyof Props, T>(name: S): PropertyValueSpecification<T> | void {
@@ -199,7 +199,9 @@ export class Transitionable<Props extends {[Key in keyof Props]: Props[Key]}> {
         // Note that we do not _remove_ an own property in the case where a value is being reset
         // to the default: the transition might still be non-default.
         this._values[name].value = new PropertyValue(this._values[name].property, value === null ? undefined : clone(value), this._scope, this._options);
-        this.isConfigDependent = this.isConfigDependent || this._values[name].value.expression.isConfigDependent;
+        if (this._values[name].value.expression.configDependencies) {
+            this.configDependencies = new Set([...this.configDependencies, ...this._values[name].value.expression.configDependencies]);
+        }
     }
 
     setTransitionOrValue<P extends PropertyValueSpecifications<Props>>(properties?: P, options?: ConfigOptions) {
@@ -428,14 +430,14 @@ export class Layout<Props extends {
     _values: PropertyValues<Props>;
     _scope: string;
     _options: ConfigOptions | null | undefined;
-    isConfigDependent: boolean;
+    configDependencies: Set<string>;
 
     constructor(properties: Properties<Props>, scope: string, options?: ConfigOptions | null) {
         this._properties = properties;
         this._values = (Object.create(properties.defaultPropertyValues));
         this._scope = scope;
         this._options = options;
-        this.isConfigDependent = false;
+        this.configDependencies = new Set();
     }
 
     getValue<S extends keyof Props, T>(name: S): PropertyValueSpecification<T> | void {
@@ -444,7 +446,9 @@ export class Layout<Props extends {
 
     setValue<S extends keyof Props>(name: S, value: any) {
         this._values[name] = new PropertyValue(this._values[name].property, value === null ? undefined : clone(value), this._scope, this._options) as PropertyValues<Props>[S];
-        this.isConfigDependent = this.isConfigDependent || this._values[name].expression.isConfigDependent;
+        if (this._values[name].expression.configDependencies) {
+            this.configDependencies = new Set([...this.configDependencies, ...this._values[name].expression.configDependencies]);
+        }
     }
 
     serialize(): PropertyValueSpecifications<Props> {
diff --git a/src/style/style.ts b/src/style/style.ts
index c19d9d18d74..b571fd8df28 100644
--- a/src/style/style.ts
+++ b/src/style/style.ts
@@ -682,7 +682,7 @@ class Style extends Evented<MapEvents> {
             options: this.options
         });
 
-        this._shouldPrecompile = this.isRootStyle();
+        this._shouldPrecompile = this.map._precompilePrograms && this.isRootStyle();
     }
 
     _isInternalStyle(json: StyleSpecification): boolean {
@@ -748,7 +748,7 @@ class Style extends Evented<MapEvents> {
             this._serializedLayers = {};
             for (const layer of layers) {
                 const styleLayer = createStyleLayer(layer, this.scope, this._styleColorTheme.lut, this.options);
-                if (styleLayer.isConfigDependent) this._configDependentLayers.add(styleLayer.fqid);
+                if (styleLayer.configDependencies.size !== 0) this._configDependentLayers.add(styleLayer.fqid);
                 styleLayer.setEventedParent(this, {layer: {id: styleLayer.id}});
                 this._layers[styleLayer.id] = styleLayer;
                 this._serializedLayers[styleLayer.id] = styleLayer.serialize();
@@ -768,7 +768,7 @@ class Style extends Evented<MapEvents> {
             const terrain = this.stylesheet.terrain;
             if (terrain) {
                 this.checkCanvasFingerprintNoise();
-                if (!this.terrainSetForDrapingOnly()) {
+                if (!this.disableElevatedTerrain && !this.terrainSetForDrapingOnly()) {
                     this._createTerrain(terrain, DrapeRenderMode.elevated);
                 }
             }
@@ -1373,6 +1373,40 @@ class Style extends Evented<MapEvents> {
         return source;
     }
 
+    precompilePrograms(layer: StyleLayer, parameters: EvaluationParameters) {
+        const painter = this.map.painter;
+
+        if (!painter) {
+            return;
+        }
+
+        for (let i = (layer.minzoom || DEFAULT_MIN_ZOOM); i < (layer.maxzoom || DEFAULT_MAX_ZOOM); i++) {
+            const programIds = layer.getProgramIds();
+            if (!programIds) continue;
+
+            for (const programId of programIds) {
+                const params = layer.getDefaultProgramParams(programId, parameters.zoom, this._styleColorTheme.lut);
+                if (params) {
+                    painter.style = this;
+                    if (this.fog) {
+                        painter._fogVisible = true;
+                        params.overrideFog = true;
+                        painter.getOrCreateProgram(programId, params);
+                    }
+                    painter._fogVisible = false;
+                    params.overrideFog = false;
+                    painter.getOrCreateProgram(programId, params);
+
+                    if (this.stylesheet.terrain || (this.stylesheet.projection && this.stylesheet.projection.name === 'globe')) {
+                        params.overrideRtt = true;
+                        painter.getOrCreateProgram(programId, params);
+                    }
+                }
+            }
+        }
+
+    }
+
     /**
      * Apply queued style updates in a batch and recalculate zoom-dependent paint properties.
      * @private
@@ -1455,32 +1489,12 @@ class Style extends Evented<MapEvents> {
             }
 
             if (!this._precompileDone && this._shouldPrecompile) {
-                for (let i = (layer.minzoom || DEFAULT_MIN_ZOOM); i < (layer.maxzoom || DEFAULT_MAX_ZOOM); i++) {
-                    const painter = this.map.painter;
-                    if (painter) {
-                        const programIds = layer.getProgramIds();
-                        if (!programIds) continue;
-
-                        for (const programId of programIds) {
-                            const params = layer.getDefaultProgramParams(programId, parameters.zoom, this._styleColorTheme.lut);
-                            if (params) {
-                                painter.style = this;
-                                if (this.fog) {
-                                    painter._fogVisible = true;
-                                    params.overrideFog = true;
-                                    painter.getOrCreateProgram(programId, params);
-                                }
-                                painter._fogVisible = false;
-                                params.overrideFog = false;
-                                painter.getOrCreateProgram(programId, params);
-
-                                if (this.stylesheet.terrain || (this.stylesheet.projection && this.stylesheet.projection.name === 'globe')) {
-                                    params.overrideRtt = true;
-                                    painter.getOrCreateProgram(programId, params);
-                                }
-                            }
-                        }
-                    }
+                if ('requestIdleCallback' in window) {
+                    requestIdleCallback(() => {
+                        this.precompilePrograms(layer, parameters);
+                    });
+                } else {
+                    this.precompilePrograms(layer, parameters);
                 }
             }
         }
@@ -1979,7 +1993,7 @@ class Style extends Evented<MapEvents> {
             minValue, maxValue, stepValue, type, values
         });
 
-        this.updateConfigDependencies();
+        this.updateConfigDependencies(key);
     }
 
     getConfig(fragmentId: string): ConfigSpecification | null | undefined {
@@ -2068,10 +2082,14 @@ class Style extends Evented<MapEvents> {
         }
     }
 
-    updateConfigDependencies() {
+    updateConfigDependencies(configKey?: string) {
         for (const id of this._configDependentLayers) {
             const layer = this.getLayer(id);
             if (layer) {
+                if (configKey && !layer.configDependencies.has(configKey)) {
+                    continue;
+                }
+
                 layer.possiblyEvaluateVisibility();
                 this._updateLayer(layer);
             }
@@ -2092,7 +2110,7 @@ class Style extends Evented<MapEvents> {
         this.forEachFragmentStyle((style: Style) => {
             if (style._styleColorTheme.colorTheme) {
                 const data = style._evaluateColorThemeData(style._styleColorTheme.colorTheme);
-                if (!style._styleColorTheme.lut || (style._styleColorTheme.lut && data !== style._styleColorTheme.lut.data)) {
+                if ((!style._styleColorTheme.lut && data !== '') || (style._styleColorTheme.lut && data !== style._styleColorTheme.lut.data)) {
                     style.setColorTheme(style._styleColorTheme.colorTheme);
                 }
             }
@@ -2141,7 +2159,7 @@ class Style extends Evented<MapEvents> {
             this._serializedLayers[layer.id] = layer.serialize();
         }
 
-        if (layer.isConfigDependent) this._configDependentLayers.add(layer.fqid);
+        if (layer.configDependencies.size !== 0) this._configDependentLayers.add(layer.fqid);
 
         let index = this._order.length;
         if (before) {
@@ -2425,7 +2443,7 @@ class Style extends Evented<MapEvents> {
         }
 
         layer.setLayoutProperty(name, value);
-        if (layer.isConfigDependent) this._configDependentLayers.add(layer.fqid);
+        if (layer.configDependencies.size !== 0) this._configDependentLayers.add(layer.fqid);
         this._updateLayer(layer);
     }
 
@@ -2464,7 +2482,7 @@ class Style extends Evented<MapEvents> {
         }
 
         const requiresRelayout = layer.setPaintProperty(name, value);
-        if (layer.isConfigDependent) this._configDependentLayers.add(layer.fqid);
+        if (layer.configDependencies.size !== 0) this._configDependentLayers.add(layer.fqid);
         if (requiresRelayout) {
             this._updateLayer(layer);
         }
@@ -2765,7 +2783,7 @@ class Style extends Evented<MapEvents> {
         sourceID: string,
         params?: {
             sourceLayer?: string;
-            filter?: FilterSpecification | ExpressionSpecification;
+            filter?: FilterSpecification;
             validate?: boolean;
         },
     ): Array<GeoJSONFeature> {
diff --git a/src/style/style_layer.ts b/src/style/style_layer.ts
index 93a57b94137..9dd601c44a1 100644
--- a/src/style/style_layer.ts
+++ b/src/style/style_layer.ts
@@ -54,7 +54,7 @@ class StyleLayer extends Evented {
     maxzoom: number | null | undefined;
     filter: FilterSpecification | undefined;
     visibility: 'visible' | 'none' | undefined;
-    isConfigDependent: boolean;
+    configDependencies: Set<string>;
 
     _unevaluatedLayout: Layout<any>;
     readonly layout: unknown;
@@ -84,7 +84,7 @@ class StyleLayer extends Evented {
 
         this._featureFilter = {filter: () => true, needGeometry: false, needFeature: false};
         this._filterCompiled = false;
-        this.isConfigDependent = false;
+        this.configDependencies = new Set();
 
         if (layer.type === 'custom') return;
 
@@ -104,7 +104,7 @@ class StyleLayer extends Evented {
 
         if (properties.layout) {
             this._unevaluatedLayout = new Layout(properties.layout, this.scope, options);
-            this.isConfigDependent = this.isConfigDependent || this._unevaluatedLayout.isConfigDependent;
+            this.configDependencies = new Set([...this.configDependencies, ...this._unevaluatedLayout.configDependencies]);
         }
 
         if (properties.paint) {
@@ -116,7 +116,7 @@ class StyleLayer extends Evented {
             for (const property in layer.layout) {
                 this.setLayoutProperty(property, layer.layout[property]);
             }
-            this.isConfigDependent = this.isConfigDependent || this._transitionablePaint.isConfigDependent;
+            this.configDependencies = new Set([...this.configDependencies, ...this._transitionablePaint.configDependencies]);
 
             this._transitioningPaint = this._transitionablePaint.untransitioned();
             this.paint = new PossiblyEvaluated(properties.paint);
@@ -152,7 +152,7 @@ class StyleLayer extends Evented {
         if (!specProps[name]) return; // skip unrecognized properties
 
         layout.setValue(name, value);
-        this.isConfigDependent = this.isConfigDependent || layout.isConfigDependent;
+        this.configDependencies = new Set([...this.configDependencies, ...layout.configDependencies]);
 
         if (name === 'visibility') {
             this.possiblyEvaluateVisibility();
@@ -192,7 +192,7 @@ class StyleLayer extends Evented {
         const oldValue = transitionable.value;
 
         paint.setValue(name, value);
-        this.isConfigDependent = this.isConfigDependent || paint.isConfigDependent;
+        this.configDependencies = new Set([...this.configDependencies, ...paint.configDependencies]);
         this._handleSpecialPaintPropertyUpdate(name);
 
         const newValue = paint._values[name].value;
diff --git a/src/tracked-parameters/tracked_parameters.ts b/src/tracked-parameters/tracked_parameters.ts
index fac5842bcbd..c532843875e 100644
--- a/src/tracked-parameters/tracked_parameters.ts
+++ b/src/tracked-parameters/tracked_parameters.ts
@@ -1,5 +1,4 @@
 import {Pane} from 'tweakpane';
-import cloneDeep from 'lodash.clonedeep';
 import serialize from 'serialize-to-js';
 import assert from 'assert';
 import {isWorker} from '../util/util';
@@ -85,7 +84,7 @@ function mergePaneParams(dest: PaneState, src: PaneState) {
         const destFolder = dest.folders.get(key);
         if (srcFolder && destFolder) {
             for (const parameterKey of Object.keys(srcFolder.current)) {
-                destFolder.current[parameterKey] = cloneDeep(srcFolder.current[parameterKey]);
+                destFolder.current[parameterKey] = structuredClone(srcFolder.current[parameterKey]);
             }
         } else if (srcFolder) {
             dest.folders.set(key, srcFolder);
@@ -122,7 +121,7 @@ function deSerializePaneParams(input?: string | null): PaneState {
                     f.isFolded = it.isFolded;
                 }
                 if (`current` in it && it.current instanceof Object) {
-                    f.current = cloneDeep(it.current);
+                    f.current = structuredClone(it.current);
                 }
                 p.folders.set(key, f);
             });
@@ -216,13 +215,13 @@ export class TrackedParameters implements ITrackedParameters {
     resetToDefaults() {
         const doReset = () => {
             this._parametersInfo.forEach((elem, key) => {
-                elem.containerObject[elem.parameterName] = cloneDeep(elem.defaultValue);
+                elem.containerObject[elem.parameterName] = structuredClone(elem.defaultValue);
 
                 // Update serializable state as well
                 const folderName = key.slice(0, key.lastIndexOf("|"));
                 const folder = this._paneState.folders.get(folderName);
                 if (folder) {
-                    folder.current[elem.parameterName] = cloneDeep(elem.defaultValue);
+                    folder.current[elem.parameterName] = structuredClone(elem.defaultValue);
                 }
             });
             this.checkDefaults();
@@ -340,7 +339,7 @@ export class TrackedParameters implements ITrackedParameters {
                     const fullParameterName = `${folderKey}|${parameterKey}`;
                     const paramInfo = this._parametersInfo.get(fullParameterName);
                     if (paramInfo && !paramInfo.noSave) {
-                        paramInfo.containerObject[parameterKey] = cloneDeep(value);
+                        paramInfo.containerObject[parameterKey] = structuredClone(value);
                     }
                 }
 
@@ -483,21 +482,21 @@ export class TrackedParameters implements ITrackedParameters {
         const fullParameterName = `${fullScopeName}|${name}`;
 
         if (!this._parametersInfo.has(fullParameterName)) {
-            const defaultValue = cloneDeep(containerObject[name]);
+            const defaultValue = structuredClone(containerObject[name]);
 
             // Check if parameter should ignore (de)serialization
             const noSave = !!(description && description.noSave);
 
             if (!noSave && folderStateObj.current.hasOwnProperty(name)) {
-                containerObject[name] = cloneDeep(folderStateObj.current[name]);
+                containerObject[name] = structuredClone(folderStateObj.current[name]);
             } else {
-                folderStateObj.current[name] = cloneDeep(containerObject[name]);
+                folderStateObj.current[name] = structuredClone(containerObject[name]);
             }
 
             // Create binding to TweakPane UI
             const binding = currentScope.addBinding(containerObject, name, description);
             binding.on('change', (ev) => {
-                folderStateObj.current[name] = cloneDeep(ev.value);
+                folderStateObj.current[name] = structuredClone(ev.value);
                 this.dump();
                 this.checkDefaults();
                 if (changeValueCallback) { changeValueCallback(ev.value); }
diff --git a/src/types/tilejson.ts b/src/types/tilejson.ts
index bb3379b375f..4e9721f3122 100644
--- a/src/types/tilejson.ts
+++ b/src/types/tilejson.ts
@@ -15,4 +15,17 @@ export type TileJSON = {
     vector_layers?: Array<any>;
     raster_layers?: Array<any>;
     variants?: Array<any>;
+    language?: {
+        [source_name: string]: string;
+    }
+    language_options?: {
+        [country_code: string]: string;
+    }
+    worldview?: {
+        [source_name: string]: string;
+    };
+    worldview_options?: {
+        [country_code: string]: string;
+    },
+    worldview_default?: string;
 };
diff --git a/src/ui/control/geolocate_control.ts b/src/ui/control/geolocate_control.ts
index 9643fe8d732..35283224679 100644
--- a/src/ui/control/geolocate_control.ts
+++ b/src/ui/control/geolocate_control.ts
@@ -649,8 +649,7 @@ class GeolocateControl extends Evented<GeolocateControlEvents> implements IContr
 
             // This timeout ensures that we still call finish() even if
             // the user declines to share their location in Firefox
-            // @ts-expect-error - TS2322 - Type 'Timeout' is not assignable to type 'number'.
-            this._timeoutId = setTimeout(this._finish, 10000 /* 10sec */);
+            this._timeoutId = window.setTimeout(this._finish, 10000 /* 10sec */);
         }
 
         return true;
diff --git a/src/ui/events.ts b/src/ui/events.ts
index 8a220c5fb57..5b0509b0959 100644
--- a/src/ui/events.ts
+++ b/src/ui/events.ts
@@ -11,6 +11,24 @@ import type {GeoJSONFeature} from '../util/vectortile_to_geojson';
 import type {EventData, EventOf} from '../util/evented';
 import type {SourceSpecification} from '../style-spec/types';
 
+type MapMouseEventType =
+    | 'mousedown'
+    | 'mouseup'
+    | 'preclick'
+    | 'click'
+    | 'dblclick'
+    | 'mousemove'
+    | 'mouseover'
+    | 'mouseenter'
+    | 'mouseleave'
+    | 'mouseout'
+    | 'contextmenu';
+
+type MapTouchEventType =
+    | 'touchstart'
+    | 'touchend'
+    | 'touchcancel';
+
 /**
  * `MapMouseEvent` is a class used by other classes to generate
  * mouse events of specific types such as 'click' or 'hover'.
@@ -39,7 +57,6 @@ import type {SourceSpecification} from '../style-spec/types';
  * @see [Example: Display popup on click](https://docs.mapbox.com/mapbox-gl-js/example/popup-on-click/)
  * @see [Example: Display popup on hover](https://www.mapbox.com/mapbox-gl-js/example/popup-on-hover/)
  */
-type MapMouseEventType = 'mousedown' | 'mouseup' | 'preclick' | 'click' | 'dblclick' | 'mousemove' | 'mouseover' | 'mouseenter' | 'mouseleave' | 'mouseout' | 'contextmenu';
 export class MapMouseEvent extends Event<MapEvents, MapMouseEventType> {
     /**
      * The type of originating event. For a full list of available events, see [`Map` events](/mapbox-gl-js/api/map/#map-events).
@@ -182,7 +199,6 @@ export class MapMouseEvent extends Event<MapEvents, MapMouseEventType> {
  * @see [Reference: `Map` events API documentation](https://docs.mapbox.com/mapbox-gl-js/api/map/#map-events)
  * @see [Example: Create a draggable point](https://docs.mapbox.com/mapbox-gl-js/example/drag-a-point/)
  */
-type MapTouchEventType = 'touchstart' | 'touchend' | 'touchcancel';
 export class MapTouchEvent extends Event<MapEvents, MapTouchEventType> {
     /**
      * The type of originating event. For a full list of available events, see [`Map` events](/mapbox-gl-js/api/map/#map-events).
@@ -359,6 +375,32 @@ export class MapWheelEvent extends Event<MapEvents, 'wheel'> {
     }
 }
 
+/**
+ * `MapBoxZoomEvent` is a class used to generate
+ * the events 'boxzoomstart', 'boxzoomend', and 'boxzoomcancel'.
+ * For a full list of available events, see [`Map` events](/mapbox-gl-js/api/map/#map-events).
+ *
+ * @typedef {Object} MapBoxZoomEvent
+ * @property {MouseEvent} originalEvent The DOM event that triggered the boxzoom event. Can be a `MouseEvent` or `KeyboardEvent`.
+ * @property {('boxzoomstart' | 'boxzoomend' | 'boxzoomcancel')} type The type of originating event. For a full list of available events, see [`Map` events](/mapbox-gl-js/api/map/#map-events).
+ * @property {Map} target The `Map` instance that triggered the event.
+ * @example
+ * // Example trigger of a BoxZoomEvent of type "boxzoomstart"
+ * map.on('boxzoomstart', (e) => {
+ *     console.log('event type:', e.type);
+ *     // event type: boxzoomstart
+ * });
+ * @example
+ * // Example of a BoxZoomEvent of type "boxzoomstart"
+ * // {
+ * //   originalEvent: {...},
+ * //   type: "boxzoomstart",
+ * //   target: {...}
+ * // }
+ * @see [Reference: `Map` events API documentation](https://docs.mapbox.com/mapbox-gl-js/api/map/#map-events)
+ * @see [Example: Highlight features within a bounding box](https://docs.mapbox.com/mapbox-gl-js/example/using-box-queryrenderedfeatures/)
+ */
+
 export type MapStyleDataEvent = {
     dataType: 'style';
 };
@@ -1465,7 +1507,7 @@ export type MapEvents = {
      * });
      * @see [Example: Generate and add a missing icon to the map](https://mapbox.com/mapbox-gl-js/example/add-image-missing-generated/)
      */
-    'styleimagemissing': void;
+    'styleimagemissing': {id: string};
 
     /**
      * Fired immediately after all style resources have been downloaded
diff --git a/src/ui/handler/scroll_zoom.ts b/src/ui/handler/scroll_zoom.ts
index 082b3d172a3..e0ea67ba8fb 100644
--- a/src/ui/handler/scroll_zoom.ts
+++ b/src/ui/handler/scroll_zoom.ts
@@ -23,6 +23,10 @@ const wheelZoomRate = 1 / 450;
 // is used to limit zoom rate in the case of very fast scrolling
 const maxScalePerFrame = 2;
 
+export type ScrollZoomHandlerOptions = {
+    around?: 'center';
+};
+
 /**
  * The `ScrollZoomHandler` allows the user to zoom the map by scrolling.
  *
@@ -40,24 +44,20 @@ class ScrollZoomHandler implements Handler {
     _aroundCoord: MercatorCoordinate;
     _type: 'wheel' | 'trackpad' | null;
     _lastValue: number;
-    _timeout: number | null | undefined; // used for delayed-handling of a single wheel movement
-    _finishTimeout: number | null | undefined; // used to delay final '{move,zoom}end' events
+    _timeout?: number; // used for delayed-handling of a single wheel movement
+    _finishTimeout: number; // used to delay final '{move,zoom}end' events
 
     _lastWheelEvent: any;
     _lastWheelEventTime: number;
 
-    _startZoom: number | null | undefined;
-    _targetZoom: number | null | undefined;
+    _startZoom?: number;
+    _targetZoom?: number;
     _delta: number;
     _lastDelta: number;
-    _easing: (arg1: number) => number | null | undefined;
-    _prevEase: {
-        start: number;
-        duration: number;
-        easing: (_: number) => number;
-    } | null | undefined;
-
-    _frameId: boolean | null | undefined;
+    _easing?: (arg1: number) => number;
+    _prevEase?: {start: number; duration: number; easing: (_: number) => number};
+
+    _frameId?: boolean;
     _handler: HandlerManager;
 
     _defaultZoomRate: number;
@@ -143,9 +143,7 @@ class ScrollZoomHandler implements Handler {
      * @example
      * map.scrollZoom.enable({around: 'center'});
      */
-    enable(options?: {
-        around?: 'center';
-    } | null) {
+    enable(options?: ScrollZoomHandlerOptions) {
         if (this.isEnabled()) return;
         this._enabled = true;
         this._aroundCenter = !!options && options.around === 'center';
@@ -201,8 +199,7 @@ class ScrollZoomHandler implements Handler {
             this._lastValue = value;
 
             // Start a timeout in case this was a singular event, and delay it by up to 40ms.
-            // @ts-expect-error - TS2322 - Type 'Timeout' is not assignable to type 'number'.
-            this._timeout = setTimeout(this._onTimeout, 40, e);
+            this._timeout = window.setTimeout(this._onTimeout, 40, e);
 
         } else if (!this._type) {
             // This is a repeating event, but we don't know the type of event just yet.
@@ -346,8 +343,7 @@ class ScrollZoomHandler implements Handler {
 
         if (finished) {
             this._active = false;
-            // @ts-expect-error - TS2322 - Type 'Timeout' is not assignable to type 'number'.
-            this._finishTimeout = setTimeout(() => {
+            this._finishTimeout = window.setTimeout(() => {
                 this._zooming = false;
                 this._handler._triggerRenderFrame();
                 delete this._targetZoom;
@@ -424,8 +420,7 @@ class ScrollZoomHandler implements Handler {
 
         clearTimeout(this._alertTimer);
 
-        // @ts-expect-error - TS2322 - Type 'Timeout' is not assignable to type 'number'.
-        this._alertTimer = setTimeout(() => {
+        this._alertTimer = window.setTimeout(() => {
             this._alertContainer.classList.remove('mapboxgl-scroll-zoom-blocker-show');
             this._alertContainer.removeAttribute("role");
         }, 200);
diff --git a/src/ui/handler/shim/touch_zoom_rotate.ts b/src/ui/handler/shim/touch_zoom_rotate.ts
index 0aac26e5d6c..2614c11c051 100644
--- a/src/ui/handler/shim/touch_zoom_rotate.ts
+++ b/src/ui/handler/shim/touch_zoom_rotate.ts
@@ -1,6 +1,10 @@
 import type {TouchZoomHandler, TouchRotateHandler} from '../touch_zoom_rotate';
 import type TapDragZoomHandler from '../tap_drag_zoom';
 
+export type TouchZoomRotateHandlerOptions = {
+    around?: 'center';
+};
+
 /**
  * The `TouchZoomRotateHandler` allows the user to zoom and rotate the map by
  * pinching on a touchscreen.
@@ -11,7 +15,6 @@ import type TapDragZoomHandler from '../tap_drag_zoom';
  * @see [Example: Toggle interactions](https://docs.mapbox.com/mapbox-gl-js/example/toggle-interaction-handlers/)
  */
 export default class TouchZoomRotateHandler {
-
     _el: HTMLElement;
     _touchZoom: TouchZoomHandler;
     _touchRotate: TouchRotateHandler;
@@ -42,9 +45,7 @@ export default class TouchZoomRotateHandler {
      * @example
      * map.touchZoomRotate.enable({around: 'center'});
      */
-    enable(options?: {
-     around?: 'center';
-    } | null) {
+    enable(options?: TouchZoomRotateHandlerOptions) {
         this._touchZoom.enable(options);
         if (!this._rotationDisabled) this._touchRotate.enable(options);
         this._tapDragZoom.enable();
diff --git a/src/ui/handler/touch_pan.ts b/src/ui/handler/touch_pan.ts
index c50c759c720..54ce551b9cf 100644
--- a/src/ui/handler/touch_pan.ts
+++ b/src/ui/handler/touch_pan.ts
@@ -153,8 +153,7 @@ export default class TouchPanHandler implements Handler {
 
         clearTimeout(this._alertTimer);
 
-        // @ts-expect-error - TS2322 - Type 'Timeout' is not assignable to type 'number'.
-        this._alertTimer = setTimeout(() => {
+        this._alertTimer = window.setTimeout(() => {
             this._alertContainer.classList.remove('mapboxgl-touch-pan-blocker-show');
             this._alertContainer.removeAttribute("role");
         }, 500);
diff --git a/src/ui/handler/touch_zoom_rotate.ts b/src/ui/handler/touch_zoom_rotate.ts
index eb8adc70f94..5c46832a8f2 100644
--- a/src/ui/handler/touch_zoom_rotate.ts
+++ b/src/ui/handler/touch_zoom_rotate.ts
@@ -4,12 +4,16 @@ import type {Map} from '../map';
 import type {Handler, HandlerResult} from '../handler';
 import {isFullscreen} from '../../util/util';
 
+export type TouchPitchHandlerOptions = {
+    around?: 'center';
+};
+
 class TwoTouchHandler implements Handler {
     _enabled: boolean;
     _active: boolean;
-    _firstTwoTouches: [number, number] | null | undefined;
-    _vector: Point | null | undefined;
-    _startVector: Point | null | undefined;
+    _firstTwoTouches?: [number, number];
+    _vector?: Point;
+    _startVector?: Point;
     _aroundCenter: boolean;
 
     constructor() {
@@ -21,16 +25,10 @@ class TwoTouchHandler implements Handler {
         this._firstTwoTouches = undefined;
     }
 
-    _start(points: [Point, Point]) {} //eslint-disable-line
-    _move(
-        points: [Point, Point],
-        pinchAround: Point | null | undefined,
-        e: TouchEvent,
-    ): HandlerResult | null | undefined { return {}; } //eslint-disable-line
+    _start(points: [Point, Point]) {}
+    _move(points: [Point, Point], pinchAround: Point | null | undefined, e: TouchEvent): HandlerResult | null | undefined { return {}; }
 
     touchstart(e: TouchEvent, points: Array<Point>, mapTouches: Array<Touch>) {
-        //console.log(e.target, e.targetTouches.length ? e.targetTouches[0].target : null);
-        //log('touchstart', points, e.target.innerHTML, e.targetTouches.length ? e.targetTouches[0].target.innerHTML: undefined);
         if (this._firstTwoTouches || mapTouches.length < 2) return;
 
         this._firstTwoTouches = [
@@ -76,9 +74,7 @@ class TwoTouchHandler implements Handler {
         this.reset();
     }
 
-    enable(options?: {
-        around?: 'center';
-    } | null) {
+    enable(options?: TouchPitchHandlerOptions) {
         this._enabled = true;
         this._aroundCenter = !!options && options.around === 'center';
     }
@@ -213,8 +209,8 @@ const ALLOWED_SINGLE_TOUCH_TIME = 100;
 export class TouchPitchHandler extends TwoTouchHandler {
 
     _valid: boolean | undefined;
-    _firstMove: number | null | undefined;
-    _lastPoints: [Point, Point] | null | undefined;
+    _firstMove?: number;
+    _lastPoints?: [Point, Point];
     _map: Map;
 
     constructor(map: Map) {
diff --git a/src/ui/map.ts b/src/ui/map.ts
index 76c23cc63c3..65299acd140 100644
--- a/src/ui/map.ts
+++ b/src/ui/map.ts
@@ -47,21 +47,22 @@ import {isFQID} from '../util/fqid';
 import type {MapEventType, MapEventOf} from './events';
 import type {PointLike} from '../types/point-like';
 import type {FeatureState} from '../style-spec/expression/index';
-import type {Evented} from '../util/evented';
 import type {RequestTransformFunction} from '../util/mapbox';
 import type {LngLatLike, LngLatBoundsLike} from '../geo/lng_lat';
 import type {CustomLayerInterface} from '../style/style_layer/custom_style_layer';
 import type {StyleImageInterface, StyleImageMetadata} from '../style/style_image';
 import type {StyleOptions, StyleSetterOptions, AnyLayer, FeatureSelector} from '../style/style';
 import type ScrollZoomHandler from './handler/scroll_zoom';
+import type {ScrollZoomHandlerOptions} from './handler/scroll_zoom';
 import type BoxZoomHandler from './handler/box_zoom';
-import type {TouchPitchHandler} from './handler/touch_zoom_rotate';
+import type {TouchPitchHandler, TouchPitchHandlerOptions} from './handler/touch_zoom_rotate';
 import type DragRotateHandler from './handler/shim/drag_rotate';
 import type DragPanHandler from './handler/shim/drag_pan';
 import type {DragPanOptions} from './handler/shim/drag_pan';
 import type KeyboardHandler from './handler/keyboard';
 import type DoubleClickZoomHandler from './handler/shim/dblclick_zoom';
 import type TouchZoomRotateHandler from './handler/shim/touch_zoom_rotate';
+import type {TouchZoomRotateHandlerOptions} from './handler/shim/touch_zoom_rotate';
 import defaultLocale from './default_locale';
 import type {TaskID} from '../util/task_queue';
 import type {Cancelable} from '../types/cancelable';
@@ -83,9 +84,7 @@ import type {
     ConfigSpecification,
     SchemaSpecification,
     ColorThemeSpecification,
-    ExpressionSpecification
 } from '../style-spec/types';
-import type StyleLayer from '../style/style_layer';
 import type {Source, SourceClass} from '../source/source';
 import type {EasingOptions} from './camera';
 import type {ContextOptions} from '../gl/context';
@@ -118,6 +117,8 @@ export type SetStyleOptions = {
     localIdeographFontFamily: StyleOptions['localIdeographFontFamily'];
 };
 
+export type QueryRenderedFeaturesOptions = Pick<QueryRenderedFeaturesParams, 'layers' | 'filter' | 'validate'>;
+
 type Listener<T extends MapEventType> = (event: MapEventOf<T>) => void;
 
 type DelegatedListener = {
@@ -152,7 +153,7 @@ export type MapOptions = {
     bounds?: LngLatBoundsLike;
     maxBounds?: LngLatBoundsLike;
     fitBoundsOptions?: EasingOptions;
-    scrollZoom?: boolean;
+    scrollZoom?: boolean | ScrollZoomHandlerOptions;
     minZoom?: number;
     maxZoom?: number;
     minPitch?: number;
@@ -162,8 +163,8 @@ export type MapOptions = {
     dragPan?: boolean | DragPanOptions;
     keyboard?: boolean;
     doubleClickZoom?: boolean;
-    touchZoomRotate?: boolean;
-    touchPitch?: boolean;
+    touchZoomRotate?: boolean | TouchZoomRotateHandlerOptions;
+    touchPitch?: boolean | TouchPitchHandlerOptions;
     cooperativeGestures?: boolean;
     trackResize?: boolean;
     center?: LngLatLike;
@@ -185,6 +186,7 @@ export type MapOptions = {
     respectPrefersReducedMotion?: boolean;
     contextCreateOptions?: ContextOptions;
     devtools?: boolean;
+    precompilePrograms?: boolean;
     repaint?: boolean;
     fadeDuration?: number;
     localFontFamily?: string;
@@ -200,7 +202,7 @@ const defaultMaxZoom = 22;
 const defaultMinPitch = 0;
 const defaultMaxPitch = 85;
 
-const defaultOptions = {
+const defaultOptions: Omit<MapOptions, 'container'> = {
     center: [0, 0],
     zoom: 0,
     bearing: 0,
@@ -248,6 +250,7 @@ const defaultOptions = {
     crossSourceCollisions: true,
     collectResourceTiming: false,
     testMode: false,
+    precompilePrograms: true
 };
 
 /**
@@ -321,7 +324,7 @@ const defaultOptions = {
  * @param {boolean} [options.antialias=false] If `true`, the gl context will be created with [MSAA antialiasing](https://en.wikipedia.org/wiki/Multisample_anti-aliasing), which can be useful for antialiasing custom layers. This is `false` by default as a performance optimization.
  * @param {boolean} [options.refreshExpiredTiles=true] If `false`, the map won't attempt to re-request tiles once they expire per their HTTP `cacheControl`/`expires` headers.
  * @param {LngLatBoundsLike} [options.maxBounds=null] If set, the map will be constrained to the given bounds.
- * @param {boolean|Object} [options.scrollZoom=true] If `true`, the "scroll to zoom" interaction is enabled. An `Object` value is passed as options to {@link ScrollZoomHandler#enable}.
+ * @param {boolean | Object} [options.scrollZoom=true] If `true`, the "scroll to zoom" interaction is enabled. An `Object` value is passed as options to {@link ScrollZoomHandler#enable}.
  * @param {boolean} [options.boxZoom=true] If `true`, the "box zoom" interaction is enabled (see {@link BoxZoomHandler}).
  * @param {boolean} [options.dragRotate=true] If `true`, the "drag to rotate" interaction is enabled (see {@link DragRotateHandler}).
  * @param {boolean | Object} [options.dragPan=true] If `true`, the "drag to pan" interaction is enabled. An `Object` value is passed as options to {@link DragPanHandler#enable}.
@@ -408,7 +411,7 @@ const defaultOptions = {
 export class Map extends Camera {
     style: Style;
     painter: Painter;
-    handlers: HandlerManager | null | undefined;
+    handlers?: HandlerManager;
 
     _container: HTMLElement;
     _missingCSSCanary: HTMLElement;
@@ -417,30 +420,30 @@ export class Map extends Camera {
     _controlPositions: {
         [_: string]: HTMLElement;
     };
-    _interactive: boolean | null | undefined;
-    _showTileBoundaries: boolean | null | undefined;
-    _showParseStatus: boolean | null | undefined;
-
-    _showTerrainWireframe: boolean | null | undefined;
-    _showLayers2DWireframe: boolean | null | undefined;
-    _showLayers3DWireframe: boolean | null | undefined;
-
-    _showQueryGeometry: boolean | null | undefined;
-    _showCollisionBoxes: boolean | null | undefined;
-    _showPadding: boolean | null | undefined;
-    _showTileAABBs: boolean | null | undefined;
+    _interactive?: boolean;
+    _showTileBoundaries?: boolean;
+    _showParseStatus?: boolean;
+
+    _showTerrainWireframe?: boolean;
+    _showLayers2DWireframe?: boolean;
+    _showLayers3DWireframe?: boolean;
+
+    _showQueryGeometry?: boolean;
+    _showCollisionBoxes?: boolean;
+    _showPadding?: boolean;
+    _showTileAABBs?: boolean;
     _showOverdrawInspector: boolean;
-    _repaint: boolean | null | undefined;
-    _vertices: boolean | null | undefined;
+    _repaint?: boolean;
+    _vertices?: boolean;
     _canvas: HTMLCanvasElement;
-    _minTileCacheSize: number | null | undefined;
-    _maxTileCacheSize: number | null | undefined;
-    _frame: Cancelable | null | undefined;
-    _renderNextFrame: boolean | null | undefined;
-    _styleDirty: boolean | null | undefined;
-    _sourcesDirty: boolean | null | undefined;
-    _placementDirty: boolean | null | undefined;
-    _occlusionOpacityChanged: boolean | null | undefined;
+    _minTileCacheSize?: number;
+    _maxTileCacheSize?: number;
+    _frame?: Cancelable;
+    _renderNextFrame?: boolean;
+    _styleDirty?: boolean;
+    _sourcesDirty?: boolean;
+    _placementDirty?: boolean;
+    _occlusionOpacityChanged?: boolean;
     _loaded: boolean;
     _fullyLoaded: boolean; // accounts for placement finishing as well
     _trackResize: boolean;
@@ -464,7 +467,7 @@ export class Map extends Camera {
     _logoControl: IControl;
     _mapId: number;
     _localIdeographFontFamily: string;
-    _localFontFamily: string | null | undefined;
+    _localFontFamily?: string;
     _requestManager: RequestManager;
     _locale: Partial<typeof defaultLocale>;
     _removed: boolean;
@@ -477,12 +480,13 @@ export class Map extends Camera {
     _averageElevation: EasedVariable;
     _containerWidth: number;
     _containerHeight: number;
-    _language: string | null | undefined | string[];
-    _worldview: string | null | undefined;
+    _language?: string | string[];
+    _worldview?: string;
     _interactionRange: [number, number];
     _visibilityHidden: number;
     _performanceMetricsCollection: boolean;
-    _tessellationStep: number | null | undefined;
+    _tessellationStep?: number;
+    _precompilePrograms: boolean;
 
     // `_useExplicitProjection` indicates that a projection is set by a call to map.setProjection()
     _useExplicitProjection: boolean;
@@ -610,6 +614,7 @@ export class Map extends Camera {
         this._containerWidth = 0;
         this._containerHeight = 0;
         this._showParseStatus = true;
+        this._precompilePrograms = options.precompilePrograms;
 
         this._averageElevationLastSampledAt = -Infinity;
         this._averageElevationExaggeration = 0;
@@ -1939,7 +1944,9 @@ export class Map extends Camera {
      * @see [Example: Highlight features within a bounding box](https://www.mapbox.com/mapbox-gl-js/example/using-box-queryrenderedfeatures/)
      * @see [Example: Filter features within map view](https://www.mapbox.com/mapbox-gl-js/example/filter-features-within-map-view/)
      */
-    queryRenderedFeatures(geometry?: PointLike | [PointLike, PointLike], options?: Pick<QueryRenderedFeaturesParams, 'layers' | 'filter' | 'validate'>): Array<GeoJSONFeature> {
+    queryRenderedFeatures(geometry: PointLike | [PointLike, PointLike], options?: QueryRenderedFeaturesOptions): Array<GeoJSONFeature>;
+    queryRenderedFeatures(options?: QueryRenderedFeaturesOptions): Array<GeoJSONFeature>;
+    queryRenderedFeatures(geometry?: PointLike | [PointLike, PointLike] | QueryRenderedFeaturesOptions, options?: QueryRenderedFeaturesOptions): Array<GeoJSONFeature> {
         // The first parameter can be omitted entirely, making this effectively an overloaded method
         // with two signatures:
         //
@@ -1958,7 +1965,7 @@ export class Map extends Camera {
         }
 
         options = options || {};
-        geometry = geometry || [([0, 0] as PointLike), ([this.transform.width, this.transform.height] as PointLike)];
+        geometry = (geometry || [[0, 0], [this.transform.width, this.transform.height]]) as PointLike;
 
         if (options.layers && Array.isArray(options.layers)) {
             for (const layerId of options.layers) {
@@ -2012,7 +2019,7 @@ export class Map extends Camera {
         sourceId: string,
         parameters?: {
             sourceLayer?: string;
-            filter?: FilterSpecification | ExpressionSpecification;
+            filter?: FilterSpecification;
             validate?: boolean;
         },
     ): Array<GeoJSONFeature> {
diff --git a/src/ui/marker.ts b/src/ui/marker.ts
index 7d97dc11695..72705b36249 100644
--- a/src/ui/marker.ts
+++ b/src/ui/marker.ts
@@ -596,8 +596,7 @@ export default class Marker extends Evented<MarkerEvents> {
             }
 
             if ((map._showingGlobe() || map.getTerrain() || map.getFog()) && !this._fadeTimer) {
-                // @ts-expect-error - TS2322 - Type 'Timeout' is not assignable to type 'number'.
-                this._fadeTimer = setTimeout(this._evaluateOpacity.bind(this), 60);
+                this._fadeTimer = window.setTimeout(this._evaluateOpacity.bind(this), 60);
             }
         });
     }
diff --git a/src/util/tile_request_cache.ts b/src/util/tile_request_cache.ts
index 7ae5b54a695..8250b06a9c8 100644
--- a/src/util/tile_request_cache.ts
+++ b/src/util/tile_request_cache.ts
@@ -9,6 +9,10 @@ let cacheCheckThreshold = 50;
 
 const MIN_TIME_UNTIL_EXPIRY = 1000 * 60 * 7; // 7 minutes. Skip caching tiles with a short enough max age.
 
+// So that caching functions correctly, these params are persisted
+// on URLs with query params otherwise stripped.
+const PERSISTENT_PARAMS = ['language', 'worldview', 'jobid'];
+
 export type ResponseOptions = {
     status: number;
     statusText: string;
@@ -96,8 +100,7 @@ export function cachePut(request: Request, response: Response, requestTime: numb
     const timeUntilExpiry = new Date(expires).getTime() - requestTime;
     if (timeUntilExpiry < MIN_TIME_UNTIL_EXPIRY) return;
 
-    // preserve `language` and `worldview` params if any
-    let strippedURL = stripQueryParameters(request.url, {persistentParams: ['language', 'worldview']});
+    let strippedURL = stripQueryParameters(request.url, {persistentParams: PERSISTENT_PARAMS});
 
     // Handle partial responses by keeping the range header in the query string
     if (response.status === 206) {
@@ -132,8 +135,7 @@ export function cacheGet(
 
     sharedCache
         .then(cache => {
-            // preserve `language` and `worldview` params if any
-            let strippedURL = stripQueryParameters(request.url, {persistentParams: ['language', 'worldview']});
+            let strippedURL = stripQueryParameters(request.url, {persistentParams: PERSISTENT_PARAMS});
 
             const range = request.headers.get('Range');
             if (range) strippedURL = setQueryParameters(strippedURL, {range});
diff --git a/src/util/web_worker_transfer.ts b/src/util/web_worker_transfer.ts
index daf733b676d..d96d7be8fd6 100644
--- a/src/util/web_worker_transfer.ts
+++ b/src/util/web_worker_transfer.ts
@@ -172,6 +172,15 @@ export function serialize(input: unknown, transferables?: Set<Transferable> | nu
         return properties;
     }
 
+    if (input instanceof Set) {
+        const properties = {'$name': 'Set'};
+        let idx = 0;
+        for (const value of input.values()) {
+            properties[++idx] = serialize(value);
+        }
+        return properties;
+    }
+
     if (typeof input === 'object') {
         const klass = input.constructor as Klass;
         const name = klass._classRegistryKey;
@@ -254,6 +263,17 @@ export function deserialize(input: Serialized): unknown {
             return map;
         }
 
+        if (name === 'Set') {
+            const set = new Set();
+            for (const key of Object.keys(input)) {
+                if (key === '$name')
+                    continue;
+                const value = (input as SerializedObject)[key];
+                set.add(deserialize(value));
+            }
+            return set;
+        }
+
         const {klass} = registry[name];
         if (!klass) {
             throw new Error(`can't deserialize unregistered class ${name}`);
diff --git a/test/build/typings/compatibility-test.ts b/test/build/typings/compatibility-test.ts
index b482eddbbbe..8147f1abcb7 100644
--- a/test/build/typings/compatibility-test.ts
+++ b/test/build/typings/compatibility-test.ts
@@ -133,11 +133,8 @@ expectType<mapboxgl.MapboxOptions>({
  */
 expectType<mapboxgl.MapboxOptions>({
     container: "map",
-    // @ts-expect-error - incompatible
     touchPitch: {around: "center"},
-    // @ts-expect-error - incompatible
     touchZoomRotate: {around: "center"},
-    // @ts-expect-error - incompatible
     scrollZoom: {around: "center"},
 });
 
diff --git a/test/build/typings/index.ts b/test/build/typings/index.ts
index 0cf9ebd4b39..5627831ae00 100644
--- a/test/build/typings/index.ts
+++ b/test/build/typings/index.ts
@@ -333,7 +333,8 @@ map.setTerrain({'source': 'mapbox-dem', 'exaggeration': 1.5});
 //
 
 const features1 = map.queryRenderedFeatures([0, 0], {layers: ['layer-id'], filter: ['>=', 'area', 80000], validate: true}) satisfies mapboxgl.GeoJSONFeature[];
-const features2 = map.querySourceFeatures('sourceId', {sourceLayer: 'sourceLayer', filter: ['>=', 'area', 80000], validate: true}) satisfies mapboxgl.GeoJSONFeature[];
+const features2 = map.queryRenderedFeatures({validate: false});
+const features3 = map.querySourceFeatures('sourceId', {sourceLayer: 'sourceLayer', filter: ['>=', 'area', 80000], validate: true}) satisfies mapboxgl.GeoJSONFeature[];
 
 //
 // Set state
diff --git a/test/build/typings/package.json b/test/build/typings/package.json
index e8325464758..40a1c2332c0 100644
--- a/test/build/typings/package.json
+++ b/test/build/typings/package.json
@@ -8,6 +8,6 @@
   },
   "devDependencies": {
     "@types/geojson": "*",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.4"
   }
 }
diff --git a/test/integration/expression-tests/array/default-value/test.json b/test/integration/expression-tests/array/default-value/test.json
index 40a849028dc..078f7ede37b 100644
--- a/test/integration/expression-tests/array/default-value/test.json
+++ b/test/integration/expression-tests/array/default-value/test.json
@@ -12,11 +12,7 @@
       "isZoomConstant": true,
       "type": "array<number>"
     },
-    "outputs": [
-      [0],
-      [],
-      [0]
-    ],
+    "outputs": [[0], [], [0]],
     "serialized": ["array", "number", null, ["get", "x"], ["literal", [0]]]
   }
 }
diff --git a/test/integration/expression-tests/array/implicit-1/test.json b/test/integration/expression-tests/array/implicit-1/test.json
index d55f44e291d..63b66172bc6 100644
--- a/test/integration/expression-tests/array/implicit-1/test.json
+++ b/test/integration/expression-tests/array/implicit-1/test.json
@@ -13,7 +13,9 @@
     },
     "outputs": [
       0,
-      {"error": "Expected value to be of type array, but found string instead."}
+      {
+        "error": "The expression [\"get\",\"array\"] evaluated to string but was expected to be of type array."
+      }
     ],
     "serialized": ["at", 0, ["array", ["get", "array"]]]
   }
diff --git a/test/integration/expression-tests/array/implicit-2/test.json b/test/integration/expression-tests/array/implicit-2/test.json
index 8c6fe029c57..a05a3cae05e 100644
--- a/test/integration/expression-tests/array/implicit-2/test.json
+++ b/test/integration/expression-tests/array/implicit-2/test.json
@@ -21,10 +21,10 @@
     "outputs": [
       ["a", "b"],
       {
-        "error": "Expected value to be of type array<string>, but found array<number, 2> instead."
+        "error": "The expression [\"get\",\"array\"] evaluated to array<number, 2> but was expected to be of type array<string>."
       },
       {
-        "error": "Expected value to be of type array<string>, but found string instead."
+        "error": "The expression [\"get\",\"array\"] evaluated to string but was expected to be of type array<string>."
       }
     ],
     "serialized": ["array", "string", ["get", "array"]]
diff --git a/test/integration/expression-tests/array/implicit-3/test.json b/test/integration/expression-tests/array/implicit-3/test.json
index 2b095e411b8..81d0c19a336 100644
--- a/test/integration/expression-tests/array/implicit-3/test.json
+++ b/test/integration/expression-tests/array/implicit-3/test.json
@@ -22,10 +22,10 @@
     "outputs": [
       [1, 2],
       {
-        "error": "Expected value to be of type array<number, 2>, but found array<number, 3> instead."
+        "error": "The expression [\"get\",\"array\"] evaluated to array<number, 3> but was expected to be of type array<number, 2>."
       },
       {
-        "error": "Expected value to be of type array<number, 2>, but found string instead."
+        "error": "The expression [\"get\",\"array\"] evaluated to string but was expected to be of type array<number, 2>."
       }
     ],
     "serialized": ["array", "number", 2, ["get", "array"]]
diff --git a/test/integration/expression-tests/array/item-type-and-length/test.json b/test/integration/expression-tests/array/item-type-and-length/test.json
index cac818e08e1..35832bd37a2 100644
--- a/test/integration/expression-tests/array/item-type-and-length/test.json
+++ b/test/integration/expression-tests/array/item-type-and-length/test.json
@@ -15,10 +15,10 @@
     "outputs": [
       [1, 0],
       {
-        "error": "Expected value to be of type array<number, 2>, but found array<number, 1> instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to array<number, 1> but was expected to be of type array<number, 2>."
       },
       {
-        "error": "Expected value to be of type array<number, 2>, but found array<number, 3> instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to array<number, 3> but was expected to be of type array<number, 2>."
       }
     ],
     "serialized": ["array", "number", 2, ["get", "x"]]
diff --git a/test/integration/expression-tests/array/item-type/test.json b/test/integration/expression-tests/array/item-type/test.json
index bd3b326bbb6..19e3ce39e7d 100644
--- a/test/integration/expression-tests/array/item-type/test.json
+++ b/test/integration/expression-tests/array/item-type/test.json
@@ -16,10 +16,10 @@
     "outputs": [
       ["a", "b"],
       {
-        "error": "Expected value to be of type array<string>, but found array<number, 2> instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to array<number, 2> but was expected to be of type array<string>."
       },
       {
-        "error": "Expected value to be of type array<string>, but found array<value, 2> instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to array<value, 2> but was expected to be of type array<string>."
       },
       []
     ],
diff --git a/test/integration/expression-tests/boolean/basic/test.json b/test/integration/expression-tests/boolean/basic/test.json
index 1bb399c31af..9b5e5835e18 100644
--- a/test/integration/expression-tests/boolean/basic/test.json
+++ b/test/integration/expression-tests/boolean/basic/test.json
@@ -19,23 +19,25 @@
     },
     "outputs": [
       {
-        "error": "Expected value to be of type boolean, but found null instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to null but was expected to be of type boolean."
       },
       true,
       false,
       {
-        "error": "Expected value to be of type boolean, but found string instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to string but was expected to be of type boolean."
       },
       {
-        "error": "Expected value to be of type boolean, but found string instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to string but was expected to be of type boolean."
       },
       {
-        "error": "Expected value to be of type boolean, but found number instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to number but was expected to be of type boolean."
       },
       {
-        "error": "Expected value to be of type boolean, but found number instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to number but was expected to be of type boolean."
       },
-      {"error": "Expected value to be of type boolean, but found null instead."}
+      {
+        "error": "The expression [\"get\",\"x\"] evaluated to null but was expected to be of type boolean."
+      }
     ],
     "serialized": ["boolean", ["get", "x"]]
   }
diff --git a/test/integration/expression-tests/case/basic/test.json b/test/integration/expression-tests/case/basic/test.json
index 510e4eb391a..b765abb3906 100644
--- a/test/integration/expression-tests/case/basic/test.json
+++ b/test/integration/expression-tests/case/basic/test.json
@@ -25,7 +25,7 @@
       "y",
       "otherwise",
       {
-        "error": "Expected value to be of type boolean, but found string instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to string but was expected to be of type boolean."
       }
     ],
     "serialized": [
diff --git a/test/integration/expression-tests/coalesce/error/test.json b/test/integration/expression-tests/coalesce/error/test.json
index 703151b208a..71ab5954ac4 100644
--- a/test/integration/expression-tests/coalesce/error/test.json
+++ b/test/integration/expression-tests/coalesce/error/test.json
@@ -22,9 +22,15 @@
     "outputs": [
       1,
       1,
-      {"error": "Expected value to be of type number, but found null instead."},
-      {"error": "Expected value to be of type number, but found null instead."},
-      {"error": "Expected value to be of type number, but found null instead."}
+      {
+        "error": "The expression [\"get\",\"x\"] evaluated to null but was expected to be of type number."
+      },
+      {
+        "error": "The expression [\"get\",\"x\"] evaluated to null but was expected to be of type number."
+      },
+      {
+        "error": "The expression [\"get\",\"x\"] evaluated to null but was expected to be of type number."
+      }
     ],
     "serialized": [
       "coalesce",
diff --git a/test/integration/expression-tests/coalesce/inference/test.json b/test/integration/expression-tests/coalesce/inference/test.json
index 8399bb10035..173c7e0e9a3 100644
--- a/test/integration/expression-tests/coalesce/inference/test.json
+++ b/test/integration/expression-tests/coalesce/inference/test.json
@@ -14,12 +14,7 @@
       "isZoomConstant": true,
       "type": "string"
     },
-    "outputs": [
-      "one",
-      "two",
-      "5",
-      ""
-    ],
+    "outputs": ["one", "two", "5", ""],
     "serialized": ["to-string", ["coalesce", ["get", "a"], ["get", "b"]]]
   }
 }
diff --git a/test/integration/expression-tests/concat/coercion/test.json b/test/integration/expression-tests/concat/coercion/test.json
index 9b872b8ad84..0ca36a44fd3 100644
--- a/test/integration/expression-tests/concat/coercion/test.json
+++ b/test/integration/expression-tests/concat/coercion/test.json
@@ -1,6 +1,6 @@
 {
   "expression": ["concat", ["get", "a"], ["get", "1"], ["get", "true"]],
-  "inputs": [[{}, {"properties": {"a": "a", "1": 1, "true": true}}]],
+  "inputs": [[{}, {"properties": {"1": 1, "a": "a", "true": true}}]],
   "expected": {
     "compiled": {
       "result": "success",
diff --git a/test/integration/expression-tests/format/data-driven-scale/test.json b/test/integration/expression-tests/format/data-driven-scale/test.json
index c34d1a6b9c4..86ee0a91f3d 100644
--- a/test/integration/expression-tests/format/data-driven-scale/test.json
+++ b/test/integration/expression-tests/format/data-driven-scale/test.json
@@ -2,22 +2,18 @@
   "expression": [
     "format",
     "a",
-    {
-      "text-font": ["array", ["string", ["get", "text-font"]]]
-    }
-  ],
-  "inputs": [
-    [{}, {"properties": {"text-font": "test"}}]
+    {"text-font": ["array", ["string", ["get", "text-font"]]]}
   ],
+  "inputs": [[{}, {"properties": {"text-font": "test"}}]],
   "expected": {
     "compiled": {
       "result": "error",
       "errors": [
-       {
-         "error": "Expected array<string> but found array instead.",
-         "key": "[1]"
-       }
-     ]
+        {
+          "key": "[1]",
+          "error": "Expected array<string> but found array instead."
+        }
+      ]
     }
   }
 }
diff --git a/test/integration/expression-tests/format/implicit-assert/test.json b/test/integration/expression-tests/format/implicit-assert/test.json
index ee26d2f0b43..1edda1ab182 100644
--- a/test/integration/expression-tests/format/implicit-assert/test.json
+++ b/test/integration/expression-tests/format/implicit-assert/test.json
@@ -1,14 +1,12 @@
 {
   "expression": ["number", ["get", "p"]],
-  "propertySpec": {
-    "type": "formatted"
-  },
+  "propertySpec": {"type": "formatted"},
   "expected": {
     "compiled": {
-        "result": "error",
-        "errors": [
-          {"key": "", "error": "Expected formatted but found number instead."}
-        ]
+      "result": "error",
+      "errors": [
+        {"key": "", "error": "Expected formatted but found number instead."}
+      ]
     }
   }
 }
diff --git a/test/integration/expression-tests/format/to-string/test.json b/test/integration/expression-tests/format/to-string/test.json
index 2c505712fbd..ab3c5be9c18 100644
--- a/test/integration/expression-tests/format/to-string/test.json
+++ b/test/integration/expression-tests/format/to-string/test.json
@@ -6,27 +6,12 @@
       "a",
       {},
       "b",
-      {
-        "font-scale": 2
-      },
+      {"font-scale": 2},
       "c",
-      {
-        "text-font": [
-          "literal",
-          [
-            "a",
-            "b"
-          ]
-        ]
-      }
-    ]
-  ],
-  "inputs": [
-    [
-      {},
-      {}
+      {"text-font": ["literal", ["a", "b"]]}
     ]
   ],
+  "inputs": [[{}, {}]],
   "expected": {
     "compiled": {
       "result": "success",
@@ -34,9 +19,7 @@
       "isZoomConstant": true,
       "type": "string"
     },
-    "outputs": [
-      "abc"
-    ],
+    "outputs": ["abc"],
     "serialized": "abc"
   }
 }
diff --git a/test/integration/expression-tests/get/basic/test.json b/test/integration/expression-tests/get/basic/test.json
index b5b8da5a40b..b2c2e863389 100644
--- a/test/integration/expression-tests/get/basic/test.json
+++ b/test/integration/expression-tests/get/basic/test.json
@@ -9,7 +9,9 @@
       "type": "number"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"x\"] evaluated to null but was expected to be of type number."
+      },
       1
     ],
     "serialized": ["number", ["get", "x"]]
diff --git a/test/integration/expression-tests/get/from-literal--missing/test.json b/test/integration/expression-tests/get/from-literal--missing/test.json
index dcd403efd4e..c5c551fa720 100644
--- a/test/integration/expression-tests/get/from-literal--missing/test.json
+++ b/test/integration/expression-tests/get/from-literal--missing/test.json
@@ -7,7 +7,7 @@
       "errors": [
         {
           "key": "",
-          "error": "Expected value to be of type number, but found null instead."
+          "error": "The expression null evaluated to null but was expected to be of type number."
         }
       ]
     }
diff --git a/test/integration/expression-tests/greater/string-and-value/test.json b/test/integration/expression-tests/greater/string-and-value/test.json
index e345c087acb..45a87c01f8a 100644
--- a/test/integration/expression-tests/greater/string-and-value/test.json
+++ b/test/integration/expression-tests/greater/string-and-value/test.json
@@ -15,10 +15,10 @@
     "outputs": [
       true,
       {
-        "error": "Expected value to be of type string, but found number instead."
+        "error": "The expression [\"get\",\"y\"] evaluated to number but was expected to be of type string."
       },
       {
-        "error": "Expected value to be of type string, but found number instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to number but was expected to be of type string."
       }
     ],
     "serialized": [">", ["string", ["get", "x"]], ["string", ["get", "y"]]]
diff --git a/test/integration/expression-tests/greater_or_equal/string-and-value/test.json b/test/integration/expression-tests/greater_or_equal/string-and-value/test.json
index 0cdd25d88a2..4fd490b8e45 100644
--- a/test/integration/expression-tests/greater_or_equal/string-and-value/test.json
+++ b/test/integration/expression-tests/greater_or_equal/string-and-value/test.json
@@ -15,10 +15,10 @@
     "outputs": [
       true,
       {
-        "error": "Expected value to be of type string, but found number instead."
+        "error": "The expression [\"get\",\"y\"] evaluated to number but was expected to be of type string."
       },
       {
-        "error": "Expected value to be of type string, but found number instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to number but was expected to be of type string."
       }
     ],
     "serialized": [">=", ["string", ["get", "x"]], ["string", ["get", "y"]]]
diff --git a/test/integration/expression-tests/image/basic/test.json b/test/integration/expression-tests/image/basic/test.json
index b797fe2720f..3aa56b62295 100644
--- a/test/integration/expression-tests/image/basic/test.json
+++ b/test/integration/expression-tests/image/basic/test.json
@@ -1,18 +1,6 @@
 {
-  "expression": [
-    "image",
-    "monument-15"
-  ],
-  "inputs": [
-    [
-        {"availableImages": ["monument-15"]},
-        {}
-    ],
-    [
-      {},
-      {}
-    ]
-  ],
+  "expression": ["image", "monument-15"],
+  "inputs": [[{"availableImages": ["monument-15"]}, {}], [{}, {}]],
   "expected": {
     "compiled": {
       "result": "success",
@@ -21,12 +9,9 @@
       "type": "resolvedImage"
     },
     "outputs": [
-      {"namePrimary":"monument-15","available":true},
-      {"namePrimary":"monument-15","available":false}
+      {"namePrimary": "monument-15", "available": true},
+      {"namePrimary": "monument-15", "available": false}
     ],
-    "serialized": [
-      "image",
-      "monument-15"
-    ]
+    "serialized": ["image", "monument-15"]
   }
 }
diff --git a/test/integration/expression-tests/image/coalesce/compare-verbose/test.json b/test/integration/expression-tests/image/coalesce/compare-verbose/test.json
index b8ef3cc54cd..32d32a52fe6 100644
--- a/test/integration/expression-tests/image/coalesce/compare-verbose/test.json
+++ b/test/integration/expression-tests/image/coalesce/compare-verbose/test.json
@@ -1,22 +1,11 @@
 {
-  "expression":
-  ["==", "missing",
-    ["to-string", ["coalesce",
-      ["image", "monument-15"],
-      "missing"
-      ]
-    ]
-  ],
-  "propertySpec": {
-    "type": "boolean"
-  },
-  "inputs": [
-    [
-      {"availableImages": ["monument-15"]},
-      {}
-    ],
-    [{}, {}]
+  "expression": [
+    "==",
+    "missing",
+    ["to-string", ["coalesce", ["image", "monument-15"], "missing"]]
   ],
+  "propertySpec": {"type": "boolean"},
+  "inputs": [[{"availableImages": ["monument-15"]}, {}], [{}, {}]],
   "expected": {
     "compiled": {
       "result": "success",
@@ -24,17 +13,11 @@
       "isZoomConstant": true,
       "type": "boolean"
     },
-    "outputs": [
-      false,
-      true
-    ],
-    "serialized":
-      ["==", "missing",
-      ["to-string", ["coalesce",
-        ["image", "monument-15"],
-        "missing"
-        ]
-      ]
+    "outputs": [false, true],
+    "serialized": [
+      "==",
+      "missing",
+      ["to-string", ["coalesce", ["image", "monument-15"], "missing"]]
     ]
   }
 }
diff --git a/test/integration/expression-tests/image/coalesce/compare/test.json b/test/integration/expression-tests/image/coalesce/compare/test.json
index d4d9a3e2d36..13441838983 100644
--- a/test/integration/expression-tests/image/coalesce/compare/test.json
+++ b/test/integration/expression-tests/image/coalesce/compare/test.json
@@ -1,19 +1,7 @@
 {
-  "expression":
-  ["to-boolean", ["coalesce",
-    ["image", "monument-15"],
-    ""
-  ]],
-  "propertySpec": {
-    "type": "boolean"
-  },
-  "inputs": [
-    [
-      {"availableImages": ["monument-15"]},
-      {}
-    ],
-    [{}, {}]
-  ],
+  "expression": ["to-boolean", ["coalesce", ["image", "monument-15"], ""]],
+  "propertySpec": {"type": "boolean"},
+  "inputs": [[{"availableImages": ["monument-15"]}, {}], [{}, {}]],
   "expected": {
     "compiled": {
       "result": "success",
@@ -21,14 +9,7 @@
       "isZoomConstant": true,
       "type": "boolean"
     },
-    "outputs": [
-      true,
-      false
-    ],
-    "serialized":
-    ["to-boolean", ["coalesce",
-      ["image", "monument-15"],
-      ""
-    ]]
+    "outputs": [true, false],
+    "serialized": ["to-boolean", ["coalesce", ["image", "monument-15"], ""]]
   }
 }
diff --git a/test/integration/expression-tests/image/coalesce/compound-verbose/test.json b/test/integration/expression-tests/image/coalesce/compound-verbose/test.json
index f8a2797eeaa..514d2dc4950 100644
--- a/test/integration/expression-tests/image/coalesce/compound-verbose/test.json
+++ b/test/integration/expression-tests/image/coalesce/compound-verbose/test.json
@@ -1,15 +1,10 @@
 {
-  "expression":
-  ["==", "missing",
-    ["to-string", ["coalesce",
-      ["image", ["get", "x"]],
-      "missing"
-      ]
-    ]
+  "expression": [
+    "==",
+    "missing",
+    ["to-string", ["coalesce", ["image", ["get", "x"]], "missing"]]
   ],
-  "propertySpec": {
-    "type": "boolean"
-  },
+  "propertySpec": {"type": "boolean"},
   "inputs": [
     [
       {"availableImages": ["monument-15"]},
@@ -24,16 +19,13 @@
       "isZoomConstant": true,
       "type": "boolean"
     },
-    "outputs": [
-      false,
-      true
-    ],
-    "serialized":
-    ["==", "missing",
-      ["to-string", ["coalesce",
-        ["image", ["string", ["get", "x"]]],
-        "missing"
-        ]
+    "outputs": [false, true],
+    "serialized": [
+      "==",
+      "missing",
+      [
+        "to-string",
+        ["coalesce", ["image", ["string", ["get", "x"]]], "missing"]
       ]
     ]
   }
diff --git a/test/integration/expression-tests/image/coalesce/compound/test.json b/test/integration/expression-tests/image/coalesce/compound/test.json
index 046bd404345..05cf1356fcf 100644
--- a/test/integration/expression-tests/image/coalesce/compound/test.json
+++ b/test/integration/expression-tests/image/coalesce/compound/test.json
@@ -1,12 +1,6 @@
 {
-  "expression":
-  ["to-boolean", ["coalesce",
-    ["image", ["get", "x"]],
-    ""
-  ]],
-  "propertySpec": {
-    "type": "boolean"
-  },
+  "expression": ["to-boolean", ["coalesce", ["image", ["get", "x"]], ""]],
+  "propertySpec": {"type": "boolean"},
   "inputs": [
     [
       {"availableImages": ["monument-15"]},
@@ -21,14 +15,10 @@
       "isZoomConstant": true,
       "type": "boolean"
     },
-    "outputs": [
-      true,
-      false
-    ],
-    "serialized":
-    ["to-boolean", ["coalesce",
-      ["image", ["string", ["get", "x"]]],
-      ""
-    ]]
+    "outputs": [true, false],
+    "serialized": [
+      "to-boolean",
+      ["coalesce", ["image", ["string", ["get", "x"]]], ""]
+    ]
   }
 }
diff --git a/test/integration/expression-tests/image/coalesce/test.json b/test/integration/expression-tests/image/coalesce/test.json
index c9864e27bf0..ff1033fa10d 100644
--- a/test/integration/expression-tests/image/coalesce/test.json
+++ b/test/integration/expression-tests/image/coalesce/test.json
@@ -1,18 +1,12 @@
 {
-  "expression": ["coalesce", ["image", "foo"], ["image", "bar"], ["image", "monument-15"]],
-  "propertySpec": {
-    "type": "resolvedImage"
-  },
-  "inputs": [
-    [
-        {"availableImages": ["monument-15"]},
-        {}
-    ],
-    [
-      {},
-      {}
-    ]
+  "expression": [
+    "coalesce",
+    ["image", "foo"],
+    ["image", "bar"],
+    ["image", "monument-15"]
   ],
+  "propertySpec": {"type": "resolvedImage"},
+  "inputs": [[{"availableImages": ["monument-15"]}, {}], [{}, {}]],
   "expected": {
     "compiled": {
       "result": "success",
@@ -21,7 +15,7 @@
       "type": "resolvedImage"
     },
     "outputs": [
-      {"namePrimary":"monument-15","available":true},
+      {"namePrimary": "monument-15", "available": true},
       {"namePrimary": "foo", "available": false}
     ],
     "serialized": [
diff --git a/test/integration/expression-tests/image/coalesce/to-string/test.json b/test/integration/expression-tests/image/coalesce/to-string/test.json
index 3cb377678b5..c791a5d5c73 100644
--- a/test/integration/expression-tests/image/coalesce/to-string/test.json
+++ b/test/integration/expression-tests/image/coalesce/to-string/test.json
@@ -1,11 +1,18 @@
 {
-  "expression": ["to-string", ["coalesce", ["image", "foo"], ["image", "bar"], ["image", "monument-15"], "no image found"]],
-  "propertySpec": {
-    "type": "string"
-  },
+  "expression": [
+    "to-string",
+    [
+      "coalesce",
+      ["image", "foo"],
+      ["image", "bar"],
+      ["image", "monument-15"],
+      "no image found"
+    ]
+  ],
+  "propertySpec": {"type": "string"},
   "inputs": [
-    [{"availableImages": ["monument-15"]},{}],
-    [{"availableImages": []},{}]
+    [{"availableImages": ["monument-15"]}, {}],
+    [{"availableImages": []}, {}]
   ],
   "expected": {
     "compiled": {
@@ -14,10 +21,16 @@
       "isZoomConstant": true,
       "type": "string"
     },
-    "outputs": [
-      "monument-15",
-      "no image found"
-    ],
-    "serialized": ["to-string", ["coalesce", ["image", "foo"], ["image", "bar"], ["image", "monument-15"], "no image found"]]
+    "outputs": ["monument-15", "no image found"],
+    "serialized": [
+      "to-string",
+      [
+        "coalesce",
+        ["image", "foo"],
+        ["image", "bar"],
+        ["image", "monument-15"],
+        "no image found"
+      ]
+    ]
   }
 }
diff --git a/test/integration/expression-tests/image/compound/test.json b/test/integration/expression-tests/image/compound/test.json
index 2ea8d85afbf..fef9da2b86c 100644
--- a/test/integration/expression-tests/image/compound/test.json
+++ b/test/integration/expression-tests/image/compound/test.json
@@ -1,15 +1,10 @@
 {
-  "expression": [
-    "image",
-    ["get", "icon"]
-  ],
+  "expression": ["image", ["get", "icon"]],
   "inputs": [
-      [
-          {"availableImages": ["monument-15"]},
-          {
-              "properties": {"icon": "monument-15"}
-          }
-      ]
+    [
+      {"availableImages": ["monument-15"]},
+      {"properties": {"icon": "monument-15"}}
+    ]
   ],
   "expected": {
     "compiled": {
@@ -18,12 +13,7 @@
       "isZoomConstant": true,
       "type": "resolvedImage"
     },
-    "outputs": [
-      {"namePrimary":"monument-15","available":true}
-    ],
-    "serialized": [
-        "image",
-        ["string", ["get", "icon"]]
-    ]
+    "outputs": [{"namePrimary": "monument-15", "available": true}],
+    "serialized": ["image", ["string", ["get", "icon"]]]
   }
 }
diff --git a/test/integration/expression-tests/image/implicit-assert/test.json b/test/integration/expression-tests/image/implicit-assert/test.json
index beb6630d537..84288fad36d 100644
--- a/test/integration/expression-tests/image/implicit-assert/test.json
+++ b/test/integration/expression-tests/image/implicit-assert/test.json
@@ -1,14 +1,12 @@
 {
   "expression": ["number", ["get", "icon"]],
-  "propertySpec": {
-    "type": "resolvedImage"
-  },
+  "propertySpec": {"type": "resolvedImage"},
   "expected": {
     "compiled": {
-        "result": "error",
-        "errors": [
-          {"key": "", "error": "Expected resolvedImage but found number instead."}
-        ]
+      "result": "error",
+      "errors": [
+        {"key": "", "error": "Expected resolvedImage but found number instead."}
+      ]
     }
   }
 }
diff --git a/test/integration/expression-tests/in/assert-array/test.json b/test/integration/expression-tests/in/assert-array/test.json
index 2aaf19b5064..10a183c5c7c 100644
--- a/test/integration/expression-tests/in/assert-array/test.json
+++ b/test/integration/expression-tests/in/assert-array/test.json
@@ -1,8 +1,5 @@
 {
-  "expression": [
-    "boolean",
-    ["in", ["get", "i"], ["array", ["get", "arr"]]]
-  ],
+  "expression": ["boolean", ["in", ["get", "i"], ["array", ["get", "arr"]]]],
   "inputs": [
     [{}, {"properties": {"i": null, "arr": [9, 8, 7]}}],
     [{}, {"properties": {"i": 1, "arr": [9, 8, 7]}}],
@@ -22,11 +19,10 @@
       false,
       true,
       true,
-      {"error":"Expected value to be of type array, but found null instead."}
+      {
+        "error": "The expression [\"get\",\"arr\"] evaluated to null but was expected to be of type array."
+      }
     ],
-    "serialized": [
-      "boolean",
-      ["in", ["get", "i"], ["array", ["get", "arr"]]]
-    ]
+    "serialized": ["boolean", ["in", ["get", "i"], ["array", ["get", "arr"]]]]
   }
 }
diff --git a/test/integration/expression-tests/in/assert-string/test.json b/test/integration/expression-tests/in/assert-string/test.json
index ce59df2ab02..371ba87edbc 100644
--- a/test/integration/expression-tests/in/assert-string/test.json
+++ b/test/integration/expression-tests/in/assert-string/test.json
@@ -20,7 +20,9 @@
       false,
       false,
       true,
-      {"error":"Expected value to be of type string, but found null instead."}
+      {
+        "error": "The expression [\"get\",\"str\"] evaluated to null but was expected to be of type string."
+      }
     ],
     "serialized": [
       "boolean",
diff --git a/test/integration/expression-tests/in/basic-array/test.json b/test/integration/expression-tests/in/basic-array/test.json
index 2bdd62bd061..c99373f29a0 100644
--- a/test/integration/expression-tests/in/basic-array/test.json
+++ b/test/integration/expression-tests/in/basic-array/test.json
@@ -1,15 +1,36 @@
 {
-  "expression": [
-    "boolean",
-    ["in", ["get", "i"], ["get", "arr"]]
-  ],
+  "expression": ["boolean", ["in", ["get", "i"], ["get", "arr"]]],
   "inputs": [
     [{}, {"properties": {"i": null, "arr": [9, 8, 7]}}],
     [{}, {"properties": {"i": 1, "arr": [9, 8, 7]}}],
     [{}, {"properties": {"i": 9, "arr": [9, 8, 7]}}],
-    [{}, {"properties": {"i": "foo", "arr": ["baz", "bar", "hello", "foo", "world"]}}],
-    [{}, {"properties": {"i": true, "arr": ["foo", 123, null, 456, false, {}, true]}}],
-    [{}, {"properties": {"i": null, "arr": ["foo", 123, null, 456, false, {}, true]}}],
+    [
+      {},
+      {
+        "properties": {
+          "i": "foo",
+          "arr": ["baz", "bar", "hello", "foo", "world"]
+        }
+      }
+    ],
+    [
+      {},
+      {
+        "properties": {
+          "i": true,
+          "arr": ["foo", 123, null, 456, false, {}, true]
+        }
+      }
+    ],
+    [
+      {},
+      {
+        "properties": {
+          "i": null,
+          "arr": ["foo", 123, null, 456, false, {}, true]
+        }
+      }
+    ],
     [{}, {"properties": {"i": 1, "arr": null}}]
   ],
   "expected": {
@@ -19,18 +40,7 @@
       "isZoomConstant": true,
       "type": "boolean"
     },
-    "outputs": [
-      false,
-      false,
-      true,
-      true,
-      true,
-      true,
-      false
-    ],
-    "serialized": [
-      "boolean",
-      ["in", ["get", "i"], ["get", "arr"]]
-    ]
+    "outputs": [false, false, true, true, true, true, false],
+    "serialized": ["boolean", ["in", ["get", "i"], ["get", "arr"]]]
   }
 }
diff --git a/test/integration/expression-tests/in/basic-string/test.json b/test/integration/expression-tests/in/basic-string/test.json
index 63110e33bf8..076da3313af 100644
--- a/test/integration/expression-tests/in/basic-string/test.json
+++ b/test/integration/expression-tests/in/basic-string/test.json
@@ -1,8 +1,5 @@
 {
-  "expression": [
-    "boolean",
-    ["in", ["get", "substr"], ["get", "str"]]
-  ],
+  "expression": ["boolean", ["in", ["get", "substr"], ["get", "str"]]],
   "inputs": [
     [{}, {"properties": {"substr": null, "str": "helloworld"}}],
     [{}, {"properties": {"substr": "foo", "str": "helloworld"}}],
@@ -36,9 +33,6 @@
       true,
       true
     ],
-    "serialized": [
-      "boolean",
-      ["in", ["get", "substr"], ["get", "str"]]
-    ]
+    "serialized": ["boolean", ["in", ["get", "substr"], ["get", "str"]]]
   }
 }
diff --git a/test/integration/expression-tests/in/invalid-haystack/test.json b/test/integration/expression-tests/in/invalid-haystack/test.json
index f855578eb8d..9ec422b4367 100644
--- a/test/integration/expression-tests/in/invalid-haystack/test.json
+++ b/test/integration/expression-tests/in/invalid-haystack/test.json
@@ -1,8 +1,5 @@
 {
-  "expression": [
-    "boolean",
-    ["in", ["get", "needle"], ["get", "haystack"]]
-  ],
+  "expression": ["boolean", ["in", ["get", "needle"], ["get", "haystack"]]],
   "inputs": [
     [{}, {"properties": {"needle": 1, "haystack": 123}}],
     [{}, {"properties": {"needle": "foo", "haystack": {}}}],
@@ -16,13 +13,14 @@
       "type": "boolean"
     },
     "outputs": [
-      {"error":"Expected second argument to be of type array or string, but found number instead."},
-      {"error":"Expected second argument to be of type array or string, but found object instead."},
+      {
+        "error": "Expected second argument to be of type array or string, but found number instead."
+      },
+      {
+        "error": "Expected second argument to be of type array or string, but found object instead."
+      },
       false
     ],
-    "serialized": [
-      "boolean",
-      ["in", ["get", "needle"], ["get", "haystack"]]
-    ]
+    "serialized": ["boolean", ["in", ["get", "needle"], ["get", "haystack"]]]
   }
 }
diff --git a/test/integration/expression-tests/in/invalid-needle/test.json b/test/integration/expression-tests/in/invalid-needle/test.json
index e70ee8b12f1..932b2e5dc3a 100644
--- a/test/integration/expression-tests/in/invalid-needle/test.json
+++ b/test/integration/expression-tests/in/invalid-needle/test.json
@@ -1,8 +1,5 @@
 {
-  "expression": [
-    "boolean",
-    ["in", ["get", "needle"], ["get", "haystack"]]
-  ],
+  "expression": ["boolean", ["in", ["get", "needle"], ["get", "haystack"]]],
   "inputs": [
     [{}, {"properties": {"needle": {}, "haystack": [9, 8, 7]}}],
     [{}, {"properties": {"needle": {}, "haystack": "helloworld"}}]
@@ -15,12 +12,13 @@
       "type": "boolean"
     },
     "outputs": [
-      {"error":"Expected first argument to be of type boolean, string, number or null, but found object instead."},
-      {"error":"Expected first argument to be of type boolean, string, number or null, but found object instead."}
+      {
+        "error": "Expected first argument to be of type boolean, string, number or null, but found object instead."
+      },
+      {
+        "error": "Expected first argument to be of type boolean, string, number or null, but found object instead."
+      }
     ],
-    "serialized": [
-      "boolean",
-      ["in", ["get", "needle"], ["get", "haystack"]]
-    ]
+    "serialized": ["boolean", ["in", ["get", "needle"], ["get", "haystack"]]]
   }
 }
diff --git a/test/integration/expression-tests/index-of/assert-array/test.json b/test/integration/expression-tests/index-of/assert-array/test.json
index eb8db5fc0ca..2a035d488e2 100644
--- a/test/integration/expression-tests/index-of/assert-array/test.json
+++ b/test/integration/expression-tests/index-of/assert-array/test.json
@@ -1,11 +1,11 @@
 {
   "expression": ["index-of", ["get", "i"], ["array", ["get", "arr"]]],
   "inputs": [
-    [{}, { "properties": { "i": null, "arr": [9, 8, 7] } }],
-    [{}, { "properties": { "i": null, "arr": [9, 8, 7, null] } }],
-    [{}, { "properties": { "i": 1, "arr": [9, 8, 7] } }],
-    [{}, { "properties": { "i": 9, "arr": [9, 8, 7, 9] } }],
-    [{}, { "properties": { "i": 1, "arr": null } }]
+    [{}, {"properties": {"i": null, "arr": [9, 8, 7]}}],
+    [{}, {"properties": {"i": null, "arr": [9, 8, 7, null]}}],
+    [{}, {"properties": {"i": 1, "arr": [9, 8, 7]}}],
+    [{}, {"properties": {"i": 9, "arr": [9, 8, 7, 9]}}],
+    [{}, {"properties": {"i": 1, "arr": null}}]
   ],
   "expected": {
     "compiled": {
@@ -19,7 +19,9 @@
       3,
       -1,
       0,
-      { "error": "Expected value to be of type array, but found null instead." }
+      {
+        "error": "The expression [\"get\",\"arr\"] evaluated to null but was expected to be of type array."
+      }
     ],
     "serialized": ["index-of", ["get", "i"], ["array", ["get", "arr"]]]
   }
diff --git a/test/integration/expression-tests/index-of/assert-string/test.json b/test/integration/expression-tests/index-of/assert-string/test.json
index 169c9808aef..89b6e9a42a8 100644
--- a/test/integration/expression-tests/index-of/assert-string/test.json
+++ b/test/integration/expression-tests/index-of/assert-string/test.json
@@ -1,10 +1,10 @@
 {
   "expression": ["index-of", ["get", "substr"], ["string", ["get", "str"]]],
   "inputs": [
-    [{}, { "properties": { "substr": null, "str": "helloworld" } }],
-    [{}, { "properties": { "substr": "foo", "str": "helloworld" } }],
-    [{}, { "properties": { "substr": "low", "str": "helloworld" } }],
-    [{}, { "properties": { "substr": "low", "str": null } }]
+    [{}, {"properties": {"substr": null, "str": "helloworld"}}],
+    [{}, {"properties": {"substr": "foo", "str": "helloworld"}}],
+    [{}, {"properties": {"substr": "low", "str": "helloworld"}}],
+    [{}, {"properties": {"substr": "low", "str": null}}]
   ],
   "expected": {
     "compiled": {
@@ -18,7 +18,7 @@
       -1,
       3,
       {
-        "error": "Expected value to be of type string, but found null instead."
+        "error": "The expression [\"get\",\"str\"] evaluated to null but was expected to be of type string."
       }
     ],
     "serialized": ["index-of", ["get", "substr"], ["string", ["get", "str"]]]
diff --git a/test/integration/expression-tests/index-of/basic-array/test.json b/test/integration/expression-tests/index-of/basic-array/test.json
index ec4c61c5a9b..54995046852 100644
--- a/test/integration/expression-tests/index-of/basic-array/test.json
+++ b/test/integration/expression-tests/index-of/basic-array/test.json
@@ -1,9 +1,9 @@
 {
   "expression": ["index-of", ["get", "i"], ["get", "arr"]],
   "inputs": [
-    [{}, { "properties": { "i": null, "arr": [9, 8, 7] } }],
-    [{}, { "properties": { "i": 1, "arr": [9, 8, 7] } }],
-    [{}, { "properties": { "i": 9, "arr": [9, 8, 7] } }],
+    [{}, {"properties": {"i": null, "arr": [9, 8, 7]}}],
+    [{}, {"properties": {"i": 1, "arr": [9, 8, 7]}}],
+    [{}, {"properties": {"i": 9, "arr": [9, 8, 7]}}],
     [
       {},
       {
@@ -22,7 +22,7 @@
         }
       }
     ],
-    [{}, { "properties": { "i": 1, "arr": null } }]
+    [{}, {"properties": {"i": 1, "arr": null}}]
   ],
   "expected": {
     "compiled": {
diff --git a/test/integration/expression-tests/index-of/basic-string/test.json b/test/integration/expression-tests/index-of/basic-string/test.json
index 8ca73640bcd..b141cebd0f5 100644
--- a/test/integration/expression-tests/index-of/basic-string/test.json
+++ b/test/integration/expression-tests/index-of/basic-string/test.json
@@ -1,13 +1,13 @@
 {
   "expression": ["index-of", ["get", "substr"], ["get", "str"]],
   "inputs": [
-    [{}, { "properties": { "substr": null, "str": "helloworld" } }],
-    [{}, { "properties": { "substr": "foo", "str": "helloworld" } }],
-    [{}, { "properties": { "substr": "low", "str": "helloworld" } }],
-    [{}, { "properties": { "substr": true, "str": "falsetrue" } }],
-    [{}, { "properties": { "substr": false, "str": "falsetrue" } }],
-    [{}, { "properties": { "substr": 123, "str": "hello123world" } }],
-    [{}, { "properties": { "substr": "low", "str": null } }],
+    [{}, {"properties": {"substr": null, "str": "helloworld"}}],
+    [{}, {"properties": {"substr": "foo", "str": "helloworld"}}],
+    [{}, {"properties": {"substr": "low", "str": "helloworld"}}],
+    [{}, {"properties": {"substr": true, "str": "falsetrue"}}],
+    [{}, {"properties": {"substr": false, "str": "falsetrue"}}],
+    [{}, {"properties": {"substr": 123, "str": "hello123world"}}],
+    [{}, {"properties": {"substr": "low", "str": null}}],
     [{}, {"properties": {"substr": "市", "str": "横浜市鶴見区"}}]
   ],
   "expected": {
diff --git a/test/integration/expression-tests/index-of/invalid-haystack/test.json b/test/integration/expression-tests/index-of/invalid-haystack/test.json
index 519d706cbc1..d2eacdfe31e 100644
--- a/test/integration/expression-tests/index-of/invalid-haystack/test.json
+++ b/test/integration/expression-tests/index-of/invalid-haystack/test.json
@@ -1,9 +1,9 @@
 {
   "expression": ["index-of", ["get", "needle"], ["get", "haystack"]],
   "inputs": [
-    [{}, { "properties": { "needle": 1, "haystack": 123 } }],
-    [{}, { "properties": { "needle": "foo", "haystack": {} } }],
-    [{}, { "properties": { "needle": "foo", "haystack": null } }]
+    [{}, {"properties": {"needle": 1, "haystack": 123}}],
+    [{}, {"properties": {"needle": "foo", "haystack": {}}}],
+    [{}, {"properties": {"needle": "foo", "haystack": null}}]
   ],
   "expected": {
     "compiled": {
diff --git a/test/integration/expression-tests/index-of/invalid-needle/test.json b/test/integration/expression-tests/index-of/invalid-needle/test.json
index c74a3489d3a..436c1f2d5df 100644
--- a/test/integration/expression-tests/index-of/invalid-needle/test.json
+++ b/test/integration/expression-tests/index-of/invalid-needle/test.json
@@ -1,8 +1,8 @@
 {
   "expression": ["index-of", ["get", "needle"], ["get", "haystack"]],
   "inputs": [
-    [{}, { "properties": { "needle": {}, "haystack": [9, 8, 7] } }],
-    [{}, { "properties": { "needle": {}, "haystack": "helloworld" } }]
+    [{}, {"properties": {"needle": {}, "haystack": [9, 8, 7]}}],
+    [{}, {"properties": {"needle": {}, "haystack": "helloworld"}}]
   ],
   "expected": {
     "compiled": {
diff --git a/test/integration/expression-tests/index-of/with-from-index/test.json b/test/integration/expression-tests/index-of/with-from-index/test.json
index e168817f569..07b06cc4484 100644
--- a/test/integration/expression-tests/index-of/with-from-index/test.json
+++ b/test/integration/expression-tests/index-of/with-from-index/test.json
@@ -1,16 +1,16 @@
 {
   "expression": ["index-of", ["get", "needle"], ["get", "hay"], ["get", "i"]],
   "inputs": [
-    [{}, { "properties": { "needle": null, "hay": "helloworld", "i": 0 } }],
-    [{}, { "properties": { "needle": "foo", "hay": "helloworld", "i": 0 } }],
-    [{}, { "properties": { "needle": "low", "hay": "helloworldlow", "i": 4 } }],
-    [{}, { "properties": { "needle": true, "hay": "falsetruetrue", "i": 6 } }],
-    [{}, { "properties": { "needle": false, "hay": "falsetrue", "i": 0 } }],
-    [{}, { "properties": { "needle": 123, "hay": "hello123world", "i": 6 } }],
-    [{}, { "properties": { "needle": "low", "hay": null, "i": 0 } }],
-    [{}, { "properties": { "needle": 7, "hay": [9, 8, 7, 8, 7, 7], "i": 3 } }],
-    [{}, { "properties": { "needle": 9, "hay": [9, 8, 7, 8, 7, 7], "i": 1 } }],
-    [{}, { "properties": { "needle": 8, "hay": [9, 8, 7, 8, 7, 7], "i": 1 } }]
+    [{}, {"properties": {"needle": null, "hay": "helloworld", "i": 0}}],
+    [{}, {"properties": {"needle": "foo", "hay": "helloworld", "i": 0}}],
+    [{}, {"properties": {"needle": "low", "hay": "helloworldlow", "i": 4}}],
+    [{}, {"properties": {"needle": true, "hay": "falsetruetrue", "i": 6}}],
+    [{}, {"properties": {"needle": false, "hay": "falsetrue", "i": 0}}],
+    [{}, {"properties": {"needle": 123, "hay": "hello123world", "i": 6}}],
+    [{}, {"properties": {"needle": "low", "hay": null, "i": 0}}],
+    [{}, {"properties": {"needle": 7, "hay": [9, 8, 7, 8, 7, 7], "i": 3}}],
+    [{}, {"properties": {"needle": 9, "hay": [9, 8, 7, 8, 7, 7], "i": 1}}],
+    [{}, {"properties": {"needle": 8, "hay": [9, 8, 7, 8, 7, 7], "i": 1}}]
   ],
   "expected": {
     "compiled": {
diff --git a/test/integration/expression-tests/interpolate/linear/test.json b/test/integration/expression-tests/interpolate/linear/test.json
index e23ff29bfa4..9924b1362b9 100644
--- a/test/integration/expression-tests/interpolate/linear/test.json
+++ b/test/integration/expression-tests/interpolate/linear/test.json
@@ -27,7 +27,7 @@
       100,
       200,
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to string but was expected to be of type number."
       }
     ],
     "serialized": [
diff --git a/test/integration/expression-tests/legacy/exponential/array/test.json b/test/integration/expression-tests/legacy/exponential/array/test.json
index 8ac806db1b7..eec4fd73068 100644
--- a/test/integration/expression-tests/legacy/exponential/array/test.json
+++ b/test/integration/expression-tests/legacy/exponential/array/test.json
@@ -28,14 +28,16 @@
       "type": "array<number, 1>"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type number."
+      },
       [0],
       [0],
       [0.5],
       [1],
       [1],
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to string but was expected to be of type number."
       }
     ],
     "serialized": [
diff --git a/test/integration/expression-tests/legacy/exponential/color-hcl/test.json b/test/integration/expression-tests/legacy/exponential/color-hcl/test.json
index 58fdc24971c..73a3cd2d284 100644
--- a/test/integration/expression-tests/legacy/exponential/color-hcl/test.json
+++ b/test/integration/expression-tests/legacy/exponential/color-hcl/test.json
@@ -27,14 +27,16 @@
       "type": "color"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type number."
+      },
       [0, 0, 0, 1],
       [0, 0, 0, 1],
       [0.5, 0.5, 0.499999, 1],
       [1, 1, 1, 1],
       [1, 1, 1, 1],
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to string but was expected to be of type number."
       }
     ],
     "serialized": [
diff --git a/test/integration/expression-tests/legacy/exponential/color-lab/test.json b/test/integration/expression-tests/legacy/exponential/color-lab/test.json
index 60ae68cdd71..7c77f42088d 100644
--- a/test/integration/expression-tests/legacy/exponential/color-lab/test.json
+++ b/test/integration/expression-tests/legacy/exponential/color-lab/test.json
@@ -27,14 +27,16 @@
       "type": "color"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type number."
+      },
       [0, 0, 0, 1],
       [0, 0, 0, 1],
       [0.499999, 0.5, 0.499999, 1],
       [1, 1, 1, 1],
       [1, 1, 1, 1],
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to string but was expected to be of type number."
       }
     ],
     "serialized": [
diff --git a/test/integration/expression-tests/legacy/exponential/color/test.json b/test/integration/expression-tests/legacy/exponential/color/test.json
index bbc8f6ecdcd..b83c531d3b0 100644
--- a/test/integration/expression-tests/legacy/exponential/color/test.json
+++ b/test/integration/expression-tests/legacy/exponential/color/test.json
@@ -26,14 +26,16 @@
       "type": "color"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type number."
+      },
       [0, 0, 0, 1],
       [0, 0, 0, 1],
       [0.5, 0.5, 0.5, 1],
       [1, 1, 1, 1],
       [1, 1, 1, 1],
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to string but was expected to be of type number."
       }
     ],
     "serialized": [
diff --git a/test/integration/expression-tests/legacy/exponential/composite/test.json b/test/integration/expression-tests/legacy/exponential/composite/test.json
index a032a0849cf..3346d54d24a 100644
--- a/test/integration/expression-tests/legacy/exponential/composite/test.json
+++ b/test/integration/expression-tests/legacy/exponential/composite/test.json
@@ -31,14 +31,16 @@
       "type": "number"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type number."
+      },
       1,
       1,
       1.5,
       2,
       2,
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to string but was expected to be of type number."
       }
     ],
     "serialized": [
diff --git a/test/integration/expression-tests/legacy/exponential/implicit/test.json b/test/integration/expression-tests/legacy/exponential/implicit/test.json
index 236c99d4425..e438ac6add2 100644
--- a/test/integration/expression-tests/legacy/exponential/implicit/test.json
+++ b/test/integration/expression-tests/legacy/exponential/implicit/test.json
@@ -22,14 +22,16 @@
       "type": "number"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type number."
+      },
       0,
       0,
       0.5,
       1,
       1,
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to string but was expected to be of type number."
       }
     ],
     "serialized": [
diff --git a/test/integration/expression-tests/legacy/exponential/number/test.json b/test/integration/expression-tests/legacy/exponential/number/test.json
index 5287be63306..88efb88dd0e 100644
--- a/test/integration/expression-tests/legacy/exponential/number/test.json
+++ b/test/integration/expression-tests/legacy/exponential/number/test.json
@@ -26,14 +26,16 @@
       "type": "number"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type number."
+      },
       0,
       0,
       0.5,
       1,
       1,
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to string but was expected to be of type number."
       }
     ],
     "serialized": [
diff --git a/test/integration/expression-tests/legacy/identity/array/test.json b/test/integration/expression-tests/legacy/identity/array/test.json
index 40c71deb964..2a09dfeecd1 100644
--- a/test/integration/expression-tests/legacy/identity/array/test.json
+++ b/test/integration/expression-tests/legacy/identity/array/test.json
@@ -21,12 +21,12 @@
     },
     "outputs": [
       {
-        "error": "Expected value to be of type array<number>, but found null instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type array<number>."
       },
       [0],
       [1],
       {
-        "error": "Expected value to be of type array<number>, but found string instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to string but was expected to be of type array<number>."
       }
     ],
     "serialized": ["array", "number", ["get", "p"]]
diff --git a/test/integration/expression-tests/legacy/identity/boolean/test.json b/test/integration/expression-tests/legacy/identity/boolean/test.json
index 0fcc53f9856..9ea15c29833 100644
--- a/test/integration/expression-tests/legacy/identity/boolean/test.json
+++ b/test/integration/expression-tests/legacy/identity/boolean/test.json
@@ -20,12 +20,12 @@
     },
     "outputs": [
       {
-        "error": "Expected value to be of type boolean, but found null instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type boolean."
       },
       true,
       false,
       {
-        "error": "Expected value to be of type boolean, but found string instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to string but was expected to be of type boolean."
       }
     ],
     "serialized": ["boolean", ["get", "p"]]
diff --git a/test/integration/expression-tests/legacy/identity/enum/test.json b/test/integration/expression-tests/legacy/identity/enum/test.json
index 28e39fd5cb0..c49e0a69b79 100644
--- a/test/integration/expression-tests/legacy/identity/enum/test.json
+++ b/test/integration/expression-tests/legacy/identity/enum/test.json
@@ -20,7 +20,9 @@
       "type": "string"
     },
     "outputs": [
-      {"error": "Expected value to be of type string, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type string."
+      },
       "a",
       "b",
       "c"
diff --git a/test/integration/expression-tests/legacy/identity/number/test.json b/test/integration/expression-tests/legacy/identity/number/test.json
index 979775ab916..98522854e33 100644
--- a/test/integration/expression-tests/legacy/identity/number/test.json
+++ b/test/integration/expression-tests/legacy/identity/number/test.json
@@ -19,11 +19,13 @@
       "type": "number"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type number."
+      },
       0,
       1,
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to string but was expected to be of type number."
       }
     ],
     "serialized": ["number", ["get", "p"]]
diff --git a/test/integration/expression-tests/legacy/identity/string/test.json b/test/integration/expression-tests/legacy/identity/string/test.json
index 70b9ef12610..45e297276ae 100644
--- a/test/integration/expression-tests/legacy/identity/string/test.json
+++ b/test/integration/expression-tests/legacy/identity/string/test.json
@@ -19,11 +19,13 @@
       "type": "string"
     },
     "outputs": [
-      {"error": "Expected value to be of type string, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type string."
+      },
       "0",
       "1",
       {
-        "error": "Expected value to be of type string, but found number instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to number but was expected to be of type string."
       }
     ],
     "serialized": ["string", ["get", "p"]]
diff --git a/test/integration/expression-tests/legacy/interval/array/test.json b/test/integration/expression-tests/legacy/interval/array/test.json
index 26c4fd020ff..f06b87868e6 100644
--- a/test/integration/expression-tests/legacy/interval/array/test.json
+++ b/test/integration/expression-tests/legacy/interval/array/test.json
@@ -28,14 +28,16 @@
       "type": "array<number, 1>"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type number."
+      },
       [0],
       [0],
       [0],
       [1],
       [1],
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to string but was expected to be of type number."
       }
     ],
     "serialized": [
diff --git a/test/integration/expression-tests/legacy/interval/color/test.json b/test/integration/expression-tests/legacy/interval/color/test.json
index 79ecf03ec8e..bcf732964f7 100644
--- a/test/integration/expression-tests/legacy/interval/color/test.json
+++ b/test/integration/expression-tests/legacy/interval/color/test.json
@@ -26,14 +26,16 @@
       "type": "color"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type number."
+      },
       [0, 0, 0, 1],
       [0, 0, 0, 1],
       [0, 0, 0, 1],
       [1, 1, 1, 1],
       [1, 1, 1, 1],
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to string but was expected to be of type number."
       }
     ],
     "serialized": [
diff --git a/test/integration/expression-tests/legacy/interval/composite/test.json b/test/integration/expression-tests/legacy/interval/composite/test.json
index 6b182fb656b..ff64008b1fb 100644
--- a/test/integration/expression-tests/legacy/interval/composite/test.json
+++ b/test/integration/expression-tests/legacy/interval/composite/test.json
@@ -31,14 +31,16 @@
       "type": "number"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type number."
+      },
       0,
       0,
       0,
       1,
       1,
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to string but was expected to be of type number."
       }
     ],
     "serialized": [
diff --git a/test/integration/expression-tests/legacy/interval/implicit/test.json b/test/integration/expression-tests/legacy/interval/implicit/test.json
index f8ce664b90d..693c1a8da9b 100644
--- a/test/integration/expression-tests/legacy/interval/implicit/test.json
+++ b/test/integration/expression-tests/legacy/interval/implicit/test.json
@@ -22,14 +22,16 @@
       "type": "string"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type number."
+      },
       "0",
       "0",
       "0",
       "1",
       "1",
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to string but was expected to be of type number."
       }
     ],
     "serialized": ["step", ["number", ["get", "p"]], "0", 1, "1"]
diff --git a/test/integration/expression-tests/legacy/interval/number/test.json b/test/integration/expression-tests/legacy/interval/number/test.json
index d08ca7f4a5a..08ae0470380 100644
--- a/test/integration/expression-tests/legacy/interval/number/test.json
+++ b/test/integration/expression-tests/legacy/interval/number/test.json
@@ -26,14 +26,16 @@
       "type": "number"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type number."
+      },
       0,
       0,
       0,
       1,
       1,
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to string but was expected to be of type number."
       }
     ],
     "serialized": ["step", ["number", ["get", "p"]], 0, 1, 1]
diff --git a/test/integration/expression-tests/legacy/interval/string/test.json b/test/integration/expression-tests/legacy/interval/string/test.json
index 91740cb156e..7e90990ba79 100644
--- a/test/integration/expression-tests/legacy/interval/string/test.json
+++ b/test/integration/expression-tests/legacy/interval/string/test.json
@@ -26,14 +26,16 @@
       "type": "string"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type number."
+      },
       "0",
       "0",
       "0",
       "1",
       "1",
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"p\"] evaluated to string but was expected to be of type number."
       }
     ],
     "serialized": ["step", ["number", ["get", "p"]], "0", 1, "1"]
diff --git a/test/integration/expression-tests/legacy/interval/tokens-property/test.json b/test/integration/expression-tests/legacy/interval/tokens-property/test.json
index 1980dcbbe3a..57c125dd4df 100644
--- a/test/integration/expression-tests/legacy/interval/tokens-property/test.json
+++ b/test/integration/expression-tests/legacy/interval/tokens-property/test.json
@@ -24,7 +24,9 @@
       "type": "string"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."},
+      {
+        "error": "The expression [\"get\",\"p\"] evaluated to null but was expected to be of type number."
+      },
       "0 {a}",
       "1 {b}",
       "0 {a}"
diff --git a/test/integration/expression-tests/less/string-and-value/test.json b/test/integration/expression-tests/less/string-and-value/test.json
index 1674ece373f..890c4893228 100644
--- a/test/integration/expression-tests/less/string-and-value/test.json
+++ b/test/integration/expression-tests/less/string-and-value/test.json
@@ -15,10 +15,10 @@
     "outputs": [
       true,
       {
-        "error": "Expected value to be of type string, but found number instead."
+        "error": "The expression [\"get\",\"y\"] evaluated to number but was expected to be of type string."
       },
       {
-        "error": "Expected value to be of type string, but found number instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to number but was expected to be of type string."
       }
     ],
     "serialized": ["<", ["string", ["get", "x"]], ["string", ["get", "y"]]]
diff --git a/test/integration/expression-tests/less_or_equal/string-and-value/test.json b/test/integration/expression-tests/less_or_equal/string-and-value/test.json
index 24b4fe682ce..4e3ea6640e2 100644
--- a/test/integration/expression-tests/less_or_equal/string-and-value/test.json
+++ b/test/integration/expression-tests/less_or_equal/string-and-value/test.json
@@ -15,10 +15,10 @@
     "outputs": [
       false,
       {
-        "error": "Expected value to be of type string, but found number instead."
+        "error": "The expression [\"get\",\"y\"] evaluated to number but was expected to be of type string."
       },
       {
-        "error": "Expected value to be of type string, but found number instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to number but was expected to be of type string."
       }
     ],
     "serialized": ["<", ["string", ["get", "x"]], ["string", ["get", "y"]]]
diff --git a/test/integration/expression-tests/let/expected-value/test.json b/test/integration/expression-tests/let/expected-value/test.json
index 157652e8d17..ff938963954 100644
--- a/test/integration/expression-tests/let/expected-value/test.json
+++ b/test/integration/expression-tests/let/expected-value/test.json
@@ -13,9 +13,7 @@
       "#ffffff"
     ]
   ],
-  "propertySpec": {
-    "type": "color"
-  },
+  "propertySpec": {"type": "color"},
   "description": "let should preserve expected type for child expressions. If the expected 'color' type in this test were not preserved, it would not get passed into the interpolation and the literal strings wouldn't automatically coerce to the 'color' type",
   "inputs": [[{}, {"properties": {"population": 100, "sq-km": 10}}]],
   "expected": {
@@ -25,9 +23,7 @@
       "isZoomConstant": true,
       "type": "color"
     },
-    "outputs": [
-      [0.09090909090909091,0.09090909090909091,0.09090909090909091,1]
-    ],
+    "outputs": [[0.090909, 0.090909, 0.090909, 1]],
     "serialized": [
       "let",
       "density",
@@ -37,21 +33,9 @@
         ["linear"],
         ["var", "density"],
         1,
-        [
-          "rgba",
-          0,
-          0,
-          0,
-          1
-        ],
+        ["rgba", 0, 0, 0, 1],
         100,
-        [
-          "rgba",
-          255,
-          255,
-          255,
-          1
-        ]
+        ["rgba", 255, 255, 255, 1]
       ]
     ]
   }
diff --git a/test/integration/expression-tests/match/label-string/test.json b/test/integration/expression-tests/match/label-string/test.json
index 01ffbe79914..2f6116cccbf 100644
--- a/test/integration/expression-tests/match/label-string/test.json
+++ b/test/integration/expression-tests/match/label-string/test.json
@@ -19,13 +19,17 @@
       "match",
       "otherwise",
       {
-        "error": "Expected value to be of type string, but found number instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to number but was expected to be of type string."
       },
       {
-        "error": "Expected value to be of type string, but found boolean instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to boolean but was expected to be of type string."
       },
-      {"error": "Expected value to be of type string, but found null instead."},
-      {"error": "Expected value to be of type string, but found null instead."}
+      {
+        "error": "The expression [\"get\",\"x\"] evaluated to null but was expected to be of type string."
+      },
+      {
+        "error": "The expression [\"get\",\"x\"] evaluated to null but was expected to be of type string."
+      }
     ],
     "serialized": ["match", ["string", ["get", "x"]], "0", "match", "otherwise"]
   }
diff --git a/test/integration/expression-tests/number-format/currency/test.json b/test/integration/expression-tests/number-format/currency/test.json
index a25b057baad..0b3f85ed326 100644
--- a/test/integration/expression-tests/number-format/currency/test.json
+++ b/test/integration/expression-tests/number-format/currency/test.json
@@ -2,10 +2,7 @@
   "expression": [
     "number-format",
     123456.789,
-    {
-        "locale": ["get", "locale"],
-        "currency": ["get", "currency"]
-    }
+    {"locale": ["get", "locale"], "currency": ["get", "currency"]}
   ],
   "inputs": [
     [{}, {"properties": {"locale": "en-US", "currency": "JPY"}}],
@@ -23,8 +20,8 @@
       "number-format",
       123456.789,
       {
-          "locale": ["string", ["get", "locale"]],
-          "currency": ["string", ["get", "currency"]]
+        "locale": ["string", ["get", "locale"]],
+        "currency": ["string", ["get", "currency"]]
       }
     ]
   }
diff --git a/test/integration/expression-tests/number-format/default/test.json b/test/integration/expression-tests/number-format/default/test.json
index 78f2e77862a..cb28c1ba463 100644
--- a/test/integration/expression-tests/number-format/default/test.json
+++ b/test/integration/expression-tests/number-format/default/test.json
@@ -1,13 +1,6 @@
-
 {
-  "expression": [
-    "number-format",
-    123456.789,
-    {}
-  ],
-  "inputs": [
-    [{}, {}]
-  ],
+  "expression": ["number-format", 123456.789, {}],
+  "inputs": [[{}, {}]],
   "expected": {
     "compiled": {
       "result": "success",
diff --git a/test/integration/expression-tests/number-format/precision/test.json b/test/integration/expression-tests/number-format/precision/test.json
index c4266201f22..8ca563adbb5 100644
--- a/test/integration/expression-tests/number-format/precision/test.json
+++ b/test/integration/expression-tests/number-format/precision/test.json
@@ -3,9 +3,9 @@
     "number-format",
     987654321.234567,
     {
-        "locale": ["get", "locale"],
-        "min-fraction-digits": ["get", "min"],
-        "max-fraction-digits": ["get", "max"]
+      "locale": ["get", "locale"],
+      "min-fraction-digits": ["get", "min"],
+      "max-fraction-digits": ["get", "max"]
     }
   ],
   "inputs": [
@@ -24,9 +24,9 @@
       "number-format",
       987654321.234567,
       {
-          "locale": ["string", ["get", "locale"]],
-          "min-fraction-digits": ["number", ["get", "min"]],
-          "max-fraction-digits": ["number", ["get", "max"]]
+        "locale": ["string", ["get", "locale"]],
+        "min-fraction-digits": ["number", ["get", "min"]],
+        "max-fraction-digits": ["number", ["get", "max"]]
       }
     ]
   }
diff --git a/test/integration/expression-tests/number-format/unit/test.json b/test/integration/expression-tests/number-format/unit/test.json
index 49de51c9a24..705f1c4b70a 100644
--- a/test/integration/expression-tests/number-format/unit/test.json
+++ b/test/integration/expression-tests/number-format/unit/test.json
@@ -2,10 +2,7 @@
   "expression": [
     "number-format",
     123456.789,
-    {
-        "locale": ["get", "locale"],
-        "unit": ["get", "unit"]
-    }
+    {"locale": ["get", "locale"], "unit": ["get", "unit"]}
   ],
   "inputs": [
     [{}, {"properties": {"locale": "en-US", "unit": "hectare"}}],
@@ -23,8 +20,8 @@
       "number-format",
       123456.789,
       {
-          "locale": ["string", ["get", "locale"]],
-          "unit": ["string", ["get", "unit"]]
+        "locale": ["string", ["get", "locale"]],
+        "unit": ["string", ["get", "unit"]]
       }
     ]
   }
diff --git a/test/integration/expression-tests/number/basic/test.json b/test/integration/expression-tests/number/basic/test.json
index a428ac19291..706e47b8c81 100644
--- a/test/integration/expression-tests/number/basic/test.json
+++ b/test/integration/expression-tests/number/basic/test.json
@@ -16,12 +16,14 @@
     "outputs": [
       1,
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to string but was expected to be of type number."
       },
       {
-        "error": "Expected value to be of type number, but found boolean instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to boolean but was expected to be of type number."
       },
-      {"error": "Expected value to be of type number, but found null instead."}
+      {
+        "error": "The expression [\"get\",\"x\"] evaluated to null but was expected to be of type number."
+      }
     ],
     "serialized": ["number", ["get", "x"]]
   }
diff --git a/test/integration/expression-tests/object/basic/test.json b/test/integration/expression-tests/object/basic/test.json
index dc0dad4e736..763a3a6d8db 100644
--- a/test/integration/expression-tests/object/basic/test.json
+++ b/test/integration/expression-tests/object/basic/test.json
@@ -17,15 +17,17 @@
     "outputs": [
       {"inner": "object"},
       {
-        "error": "Expected value to be of type object, but found number instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to number but was expected to be of type object."
       },
       {
-        "error": "Expected value to be of type object, but found string instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to string but was expected to be of type object."
       },
       {
-        "error": "Expected value to be of type object, but found boolean instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to boolean but was expected to be of type object."
       },
-      {"error": "Expected value to be of type object, but found null instead."}
+      {
+        "error": "The expression [\"get\",\"x\"] evaluated to null but was expected to be of type object."
+      }
     ],
     "serialized": ["object", ["get", "x"]]
   }
diff --git a/test/integration/expression-tests/object/implicit/test.json b/test/integration/expression-tests/object/implicit/test.json
index 70dc100d293..1c17a114edc 100644
--- a/test/integration/expression-tests/object/implicit/test.json
+++ b/test/integration/expression-tests/object/implicit/test.json
@@ -14,7 +14,7 @@
     "outputs": [
       0,
       {
-        "error": "Expected value to be of type object, but found string instead."
+        "error": "The expression [\"get\",\"a\"] evaluated to string but was expected to be of type object."
       }
     ],
     "serialized": ["get", "b", ["object", ["get", "a"]]]
diff --git a/test/integration/expression-tests/parse/non-string/test.json b/test/integration/expression-tests/parse/non-string/test.json
index 600b801ce5f..05ac6ff62dd 100644
--- a/test/integration/expression-tests/parse/non-string/test.json
+++ b/test/integration/expression-tests/parse/non-string/test.json
@@ -11,4 +11,4 @@
     "outputs": [[1, 2]],
     "serialized": [1, 2]
   }
-}
\ No newline at end of file
+}
diff --git a/test/integration/expression-tests/parse/unknown-expression/test.json b/test/integration/expression-tests/parse/unknown-expression/test.json
index b7ceea01dc9..d4cf43366b4 100644
--- a/test/integration/expression-tests/parse/unknown-expression/test.json
+++ b/test/integration/expression-tests/parse/unknown-expression/test.json
@@ -3,12 +3,7 @@
   "expected": {
     "compiled": {
       "result": "error",
-      "errors": [
-        {
-          "key": "[1][4]",
-          "error": "Expected number but found array."
-        }
-      ]
+      "errors": [{"key": "[1][4]", "error": "Expected number but found array."}]
     }
   }
 }
diff --git a/test/integration/expression-tests/random/basic/test.json b/test/integration/expression-tests/random/basic/test.json
index 68f4ed0073a..5b8d70e7855 100644
--- a/test/integration/expression-tests/random/basic/test.json
+++ b/test/integration/expression-tests/random/basic/test.json
@@ -8,7 +8,7 @@
       "isZoomConstant": true,
       "type": "number"
     },
-    "outputs": [0.7329497812315822],
+    "outputs": [0.732949],
     "serialized": 0.7329497812315822
   }
 }
diff --git a/test/integration/expression-tests/random/data-driven/test.json b/test/integration/expression-tests/random/data-driven/test.json
index c2bad42b4bf..6b07588c784 100644
--- a/test/integration/expression-tests/random/data-driven/test.json
+++ b/test/integration/expression-tests/random/data-driven/test.json
@@ -14,13 +14,7 @@
       "isZoomConstant": true,
       "type": "number"
     },
-    "outputs": [
-      7.868636625353247,
-      6.89881898695603,
-      2.6642920868471265,
-      6.2707394058816135,
-      9.285277789458632
-    ],
+    "outputs": [7.86863, 6.89881, 2.66429, 6.27073, 9.28527],
     "serialized": ["random", 0, 10, ["get", "a"]]
   }
 }
diff --git a/test/integration/expression-tests/slice/array-one-index/test.json b/test/integration/expression-tests/slice/array-one-index/test.json
index 485cc3cd599..f80b79430fe 100644
--- a/test/integration/expression-tests/slice/array-one-index/test.json
+++ b/test/integration/expression-tests/slice/array-one-index/test.json
@@ -1,10 +1,10 @@
 {
   "expression": ["slice", ["array", ["get", "val"]], ["get", "index"]],
   "inputs": [
-    [{}, { "properties": { "val": [1, 2, 3, 4, 5], "index": 2 } }],
-    [{}, { "properties": { "val": [1, 2, 3, 4, 5], "index": 0 } }],
-    [{}, { "properties": { "val": [1, 2, 3, 4, 5], "index": 99 } }],
-    [{}, { "properties": { "val": [1, 2, 3, 4, 5], "index": -2 } }]
+    [{}, {"properties": {"val": [1, 2, 3, 4, 5], "index": 2}}],
+    [{}, {"properties": {"val": [1, 2, 3, 4, 5], "index": 0}}],
+    [{}, {"properties": {"val": [1, 2, 3, 4, 5], "index": 99}}],
+    [{}, {"properties": {"val": [1, 2, 3, 4, 5], "index": -2}}]
   ],
   "expected": {
     "compiled": {
diff --git a/test/integration/expression-tests/slice/array-two-indexes/test.json b/test/integration/expression-tests/slice/array-two-indexes/test.json
index 3cf98723e15..ace885c1796 100644
--- a/test/integration/expression-tests/slice/array-two-indexes/test.json
+++ b/test/integration/expression-tests/slice/array-two-indexes/test.json
@@ -6,12 +6,12 @@
     ["get", "i2"]
   ],
   "inputs": [
-    [{}, { "properties": { "val": [1, 2, 3, 4, 5], "i1": 2, "i2": 4 } }],
-    [{}, { "properties": { "val": [1, 2, 3, 4, 5], "i1": 1, "i2": 5 } }],
-    [{}, { "properties": { "val": [1, 2, 3, 4, 5], "i1": 1, "i2": 99 } }],
-    [{}, { "properties": { "val": [1, 2, 3, 4, 5], "i1": -4, "i2": -2 } }],
-    [{}, { "properties": { "val": [1, 2, 3, 4, 5], "i1": 0, "i2": -1 } }],
-    [{}, { "properties": { "val": [1, 2, 3, 4, 5], "i1": 0, "i2": 0 } }]
+    [{}, {"properties": {"val": [1, 2, 3, 4, 5], "i1": 2, "i2": 4}}],
+    [{}, {"properties": {"val": [1, 2, 3, 4, 5], "i1": 1, "i2": 5}}],
+    [{}, {"properties": {"val": [1, 2, 3, 4, 5], "i1": 1, "i2": 99}}],
+    [{}, {"properties": {"val": [1, 2, 3, 4, 5], "i1": -4, "i2": -2}}],
+    [{}, {"properties": {"val": [1, 2, 3, 4, 5], "i1": 0, "i2": -1}}],
+    [{}, {"properties": {"val": [1, 2, 3, 4, 5], "i1": 0, "i2": 0}}]
   ],
   "expected": {
     "compiled": {
diff --git a/test/integration/expression-tests/slice/invalid-inputs/test.json b/test/integration/expression-tests/slice/invalid-inputs/test.json
index 408ba716db3..5fad21acd18 100644
--- a/test/integration/expression-tests/slice/invalid-inputs/test.json
+++ b/test/integration/expression-tests/slice/invalid-inputs/test.json
@@ -1,12 +1,12 @@
 {
   "expression": ["slice", ["get", "input"], ["get", "i1"]],
   "inputs": [
-    [{}, { "properties": { "input": false, "i1": 1 } }],
-    [{}, { "properties": { "input": null, "i1": 1 } }],
-    [{}, { "properties": { "input": 12, "i1": 1 } }],
-    [{}, { "properties": { "input": {}, "i1": 1 } }],
-    [{}, { "properties": { "other": 1, "i1": 1 } }],
-    [{}, { "properties": { "input": "correct", "i1": "one" } }]
+    [{}, {"properties": {"input": false, "i1": 1}}],
+    [{}, {"properties": {"input": null, "i1": 1}}],
+    [{}, {"properties": {"input": 12, "i1": 1}}],
+    [{}, {"properties": {"input": {}, "i1": 1}}],
+    [{}, {"properties": {"other": 1, "i1": 1}}],
+    [{}, {"properties": {"input": "correct", "i1": "one"}}]
   ],
   "expected": {
     "compiled": {
@@ -32,7 +32,7 @@
         "error": "Expected first argument to be of type array or string, but found null instead."
       },
       {
-        "error": "Expected value to be of type number, but found string instead."
+        "error": "The expression [\"get\",\"i1\"] evaluated to string but was expected to be of type number."
       }
     ],
     "serialized": ["slice", ["get", "input"], ["number", ["get", "i1"]]]
diff --git a/test/integration/expression-tests/slice/string-one-index/test.json b/test/integration/expression-tests/slice/string-one-index/test.json
index 963f1989ac0..521c554236d 100644
--- a/test/integration/expression-tests/slice/string-one-index/test.json
+++ b/test/integration/expression-tests/slice/string-one-index/test.json
@@ -1,11 +1,11 @@
 {
   "expression": ["slice", ["get", "val"], ["get", "index"]],
   "inputs": [
-    [{}, { "properties": { "val": "0123456789", "index": 0 } }],
-    [{}, { "properties": { "val": "0123456789", "index": 4 } }],
-    [{}, { "properties": { "val": "0123456789", "index": 99 } }],
-    [{}, { "properties": { "val": "0123456789", "index": -2 } }],
-    [{}, { "properties": { "val": "横浜市", "index": 2 } }]
+    [{}, {"properties": {"val": "0123456789", "index": 0}}],
+    [{}, {"properties": {"val": "0123456789", "index": 4}}],
+    [{}, {"properties": {"val": "0123456789", "index": 99}}],
+    [{}, {"properties": {"val": "0123456789", "index": -2}}],
+    [{}, {"properties": {"val": "横浜市", "index": 2}}]
   ],
   "expected": {
     "compiled": {
diff --git a/test/integration/expression-tests/slice/string-two-indexes/test.json b/test/integration/expression-tests/slice/string-two-indexes/test.json
index 39089a83c4f..2d1b205cf88 100644
--- a/test/integration/expression-tests/slice/string-two-indexes/test.json
+++ b/test/integration/expression-tests/slice/string-two-indexes/test.json
@@ -1,11 +1,11 @@
 {
   "expression": ["slice", ["get", "val"], ["get", "i1"], ["get", "i2"]],
   "inputs": [
-    [{}, { "properties": { "val": "0123456789", "i1": 1, "i2": 8 } }],
-    [{}, { "properties": { "val": "0123456789", "i1": 4, "i2": -2 } }],
-    [{}, { "properties": { "val": "0123456789", "i1": -3, "i2": -1 } }],
-    [{}, { "properties": { "val": "0123456789", "i1": 0, "i2": -1 } }],
-    [{}, { "properties": { "val": "0123456789", "i1": 0, "i2": 99 } }]
+    [{}, {"properties": {"val": "0123456789", "i1": 1, "i2": 8}}],
+    [{}, {"properties": {"val": "0123456789", "i1": 4, "i2": -2}}],
+    [{}, {"properties": {"val": "0123456789", "i1": -3, "i2": -1}}],
+    [{}, {"properties": {"val": "0123456789", "i1": 0, "i2": -1}}],
+    [{}, {"properties": {"val": "0123456789", "i1": 0, "i2": 99}}]
   ],
   "expected": {
     "compiled": {
diff --git a/test/integration/expression-tests/string/basic/test.json b/test/integration/expression-tests/string/basic/test.json
index d40c2593ce3..9bb87798ea4 100644
--- a/test/integration/expression-tests/string/basic/test.json
+++ b/test/integration/expression-tests/string/basic/test.json
@@ -16,12 +16,14 @@
     "outputs": [
       "1",
       {
-        "error": "Expected value to be of type string, but found number instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to number but was expected to be of type string."
       },
       {
-        "error": "Expected value to be of type string, but found boolean instead."
+        "error": "The expression [\"get\",\"x\"] evaluated to boolean but was expected to be of type string."
       },
-      {"error": "Expected value to be of type string, but found null instead."}
+      {
+        "error": "The expression [\"get\",\"x\"] evaluated to null but was expected to be of type string."
+      }
     ],
     "serialized": ["string", ["get", "x"]]
   }
diff --git a/test/integration/expression-tests/to-color/color/test.json b/test/integration/expression-tests/to-color/color/test.json
index c3ca158caea..6d79c608235 100644
--- a/test/integration/expression-tests/to-color/color/test.json
+++ b/test/integration/expression-tests/to-color/color/test.json
@@ -1,8 +1,6 @@
 {
   "expression": ["to-color", ["rgba", 0, 0, 0, 1]],
-  "inputs": [
-    [{}, {}]
-  ],
+  "inputs": [[{}, {}]],
   "expected": {
     "compiled": {
       "result": "success",
@@ -10,9 +8,7 @@
       "isZoomConstant": true,
       "type": "color"
     },
-    "outputs": [
-      [0, 0, 0, 1]
-    ],
+    "outputs": [[0, 0, 0, 1]],
     "serialized": ["rgba", 0, 0, 0, 1]
   }
 }
diff --git a/test/integration/expression-tests/to-number/2-ary/test.json b/test/integration/expression-tests/to-number/2-ary/test.json
index bbed5b9cbab..c08e53ae6d4 100644
--- a/test/integration/expression-tests/to-number/2-ary/test.json
+++ b/test/integration/expression-tests/to-number/2-ary/test.json
@@ -18,17 +18,7 @@
       "isZoomConstant": true,
       "type": "number"
     },
-    "outputs": [
-      1,
-      1,
-      6.02e-23,
-      -1,
-      0,
-      -1,
-      -1,
-      0,
-      0
-    ],
+    "outputs": [1, 1, 6.02e-23, -1, 0, -1, -1, 0, 0],
     "serialized": ["to-number", ["get", "x"], ["get", "y"]]
   }
 }
diff --git a/test/integration/expression-tests/to-string/implicit/test.json b/test/integration/expression-tests/to-string/implicit/test.json
index d13d2b807d0..dad5f2ec376 100644
--- a/test/integration/expression-tests/to-string/implicit/test.json
+++ b/test/integration/expression-tests/to-string/implicit/test.json
@@ -1,8 +1,6 @@
 {
   "expression": ["get", "p"],
-  "propertySpec": {
-    "type": "string"
-  },
+  "propertySpec": {"type": "string"},
   "inputs": [
     [{}, {"properties": {}}],
     [{}, {"properties": {"p": 0}}],
@@ -16,9 +14,6 @@
       "type": "string"
     },
     "outputs": ["", "0", "a"],
-    "serialized": [
-      "to-string",
-      ["get", "p"]
-    ]
+    "serialized": ["to-string", ["get", "p"]]
   }
 }
diff --git a/test/integration/expression-tests/within/invalid-geojson/test.json b/test/integration/expression-tests/within/invalid-geojson/test.json
index bd944da7d9f..4b89ba9983f 100644
--- a/test/integration/expression-tests/within/invalid-geojson/test.json
+++ b/test/integration/expression-tests/within/invalid-geojson/test.json
@@ -1,52 +1,31 @@
 {
-  "expression": ["within", {
-      "type": "LineString",
-      "coordinates": [[0, 0], [0, 5], [5, 5], [5, 0]]
-    }],
-  "inputs": [[{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [6, 6]
-        }
-      }], [{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [2, 2]
-        }
-      }], [{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-        "geometry": {
-          "type": "LineString",
-          "coordinates": [[3, 3], [4, 1]]
-        }
-      }]],
+  "expression": [
+    "within",
+    {"type": "LineString", "coordinates": [[0, 0], [0, 5], [5, 5], [5, 0]]}
+  ],
+  "inputs": [
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "Point", "coordinates": [6, 6]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "Point", "coordinates": [2, 2]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "LineString", "coordinates": [[3, 3], [4, 1]]}}
+    ]
+  ],
   "expected": {
     "compiled": {
-      "errors": [{
+      "result": "error",
+      "errors": [
+        {
           "key": "",
           "error": "'within' expression requires valid geojson object that contains polygon geometry type."
-        }],
-      "result": "error"
+        }
+      ]
     }
   }
 }
diff --git a/test/integration/expression-tests/within/line-within-polygon/test.json b/test/integration/expression-tests/within/line-within-polygon/test.json
index b42c19c999b..142ef61af92 100644
--- a/test/integration/expression-tests/within/line-within-polygon/test.json
+++ b/test/integration/expression-tests/within/line-within-polygon/test.json
@@ -1,44 +1,35 @@
 {
-  "expression": ["within", {
+  "expression": [
+    "within",
+    {
       "type": "Polygon",
       "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]]
-    }],
-  "inputs": [[{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-        "geometry": {
-          "type": "LineString",
-          "coordinates": [[3, 3], [4, 1]]
-        }
-      }], [{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-        "geometry": {
-          "type": "LineString",
-          "coordinates": [[3, 3], [6, 6]]
-        }
-      }]],
+    }
+  ],
+  "inputs": [
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "LineString", "coordinates": [[3, 3], [4, 1]]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "LineString", "coordinates": [[3, 3], [6, 6]]}}
+    ]
+  ],
   "expected": {
     "compiled": {
-      "type": "boolean",
+      "result": "success",
       "isFeatureConstant": false,
       "isZoomConstant": true,
-      "result": "success"
+      "type": "boolean"
     },
     "outputs": [true, false],
-    "serialized": ["within", {
-        "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
-        "type": "Polygon"
-      }]
+    "serialized": [
+      "within",
+      {
+        "type": "Polygon",
+        "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]]
+      }
+    ]
   }
 }
diff --git a/test/integration/expression-tests/within/line-within-polygons/test.json b/test/integration/expression-tests/within/line-within-polygons/test.json
index c193086bcd3..3e6f4dbc7b3 100644
--- a/test/integration/expression-tests/within/line-within-polygons/test.json
+++ b/test/integration/expression-tests/within/line-within-polygons/test.json
@@ -1,81 +1,53 @@
 {
-  "expression": ["within", {
-        "type": "MultiPolygon",
-        "coordinates": [[[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
-                       [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]]
-      }],
-  "inputs": [[{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-        "geometry": {
-          "type": "LineString",
-          "coordinates": [[3, 3], [4, 1]]
-        }
-      }], [{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-        "geometry": {
-          "type": "LineString",
-          "coordinates": [[3, 3], [-2, -2]]
-        }
-      }], [{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-        "geometry": {
-          "type": "LineString",
-          "coordinates": [[0, 0], [2, 2]]
-        }
-      }], [{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-        "geometry": {
-          "type": "LineString",
-          "coordinates": [[1, 3], [-2, -2]]
-        }
-      }], [{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-        "geometry": {
-          "type": "LineString",
-          "coordinates": [[-1, -1], [-2, -2]]
-        }
-      }]],
+  "expression": [
+    "within",
+    {
+      "type": "MultiPolygon",
+      "coordinates": [
+        [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
+        [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]
+      ]
+    }
+  ],
+  "inputs": [
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "LineString", "coordinates": [[3, 3], [4, 1]]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "LineString", "coordinates": [[3, 3], [-2, -2]]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "LineString", "coordinates": [[0, 0], [2, 2]]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "LineString", "coordinates": [[1, 3], [-2, -2]]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "LineString", "coordinates": [[-1, -1], [-2, -2]]}}
+    ]
+  ],
   "expected": {
     "compiled": {
-      "type": "boolean",
+      "result": "success",
       "isFeatureConstant": false,
       "isZoomConstant": true,
-      "result": "success"
+      "type": "boolean"
     },
     "outputs": [true, false, false, false, true],
-    "serialized": ["within", {
-        "coordinates": [[[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]], [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]],
-        "type": "MultiPolygon"
-      }]
+    "serialized": [
+      "within",
+      {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
+          [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]
+        ]
+      }
+    ]
   }
 }
diff --git a/test/integration/expression-tests/within/lines-within-polygon/test.json b/test/integration/expression-tests/within/lines-within-polygon/test.json
index ac914ed9b33..73aaa4534dc 100644
--- a/test/integration/expression-tests/within/lines-within-polygon/test.json
+++ b/test/integration/expression-tests/within/lines-within-polygon/test.json
@@ -1,44 +1,45 @@
 {
-  "expression": ["within", {
+  "expression": [
+    "within",
+    {
       "type": "Polygon",
       "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]]
-    }],
-  "inputs": [[{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
+    }
+  ],
+  "inputs": [
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {
         "geometry": {
           "type": "MultiLineString",
           "coordinates": [[[3, 3], [4, 1]], [[-2, -2], [-1, -1]]]
         }
-      }], [{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-       "geometry": {
+      }
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {
+        "geometry": {
           "type": "MultiLineString",
           "coordinates": [[[3, 3], [2, 2]], [[1, 1], [2, 2], [3, 2]]]
         }
-      }]],
+      }
+    ]
+  ],
   "expected": {
     "compiled": {
-      "type": "boolean",
+      "result": "success",
       "isFeatureConstant": false,
       "isZoomConstant": true,
-      "result": "success"
+      "type": "boolean"
     },
     "outputs": [false, true],
-    "serialized": ["within", {
-        "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
-        "type": "Polygon"
-      }]
+    "serialized": [
+      "within",
+      {
+        "type": "Polygon",
+        "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]]
+      }
+    ]
   }
 }
diff --git a/test/integration/expression-tests/within/lines-within-polygons/test.json b/test/integration/expression-tests/within/lines-within-polygons/test.json
index 936463c000b..a97c05cf851 100644
--- a/test/integration/expression-tests/within/lines-within-polygons/test.json
+++ b/test/integration/expression-tests/within/lines-within-polygons/test.json
@@ -1,57 +1,60 @@
 {
-  "expression": ["within", {
-        "type": "MultiPolygon",
-        "coordinates": [[[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
-                       [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]]
-      }],
-  "inputs": [[{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
+  "expression": [
+    "within",
+    {
+      "type": "MultiPolygon",
+      "coordinates": [
+        [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
+        [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]
+      ]
+    }
+  ],
+  "inputs": [
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {
         "geometry": {
           "type": "MultiLineString",
           "coordinates": [[[3, 3], [4, 1]], [[-2, -2], [-1, -1]]]
         }
-      }], [{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-       "geometry": {
+      }
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {
+        "geometry": {
           "type": "MultiLineString",
           "coordinates": [[[3, 3], [2, 2]], [[1, 1], [2, 2], [3, 2]]]
         }
-      }], [{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-       "geometry": {
+      }
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {
+        "geometry": {
           "type": "MultiLineString",
           "coordinates": [[[3, 3], [2, 2]], [[-1, 1], [2, 2], [3, 2]]]
         }
-      }]],
+      }
+    ]
+  ],
   "expected": {
     "compiled": {
-      "type": "boolean",
+      "result": "success",
       "isFeatureConstant": false,
       "isZoomConstant": true,
-      "result": "success"
+      "type": "boolean"
     },
     "outputs": [true, true, false],
-    "serialized": ["within", {
-        "coordinates": [[[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]], [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]],
-        "type": "MultiPolygon"
-      }]
+    "serialized": [
+      "within",
+      {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
+          [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]
+        ]
+      }
+    ]
   }
 }
diff --git a/test/integration/expression-tests/within/meridian-issue-line-1/test.json b/test/integration/expression-tests/within/meridian-issue-line-1/test.json
index ac4f1cbf63c..759c2ee5b81 100644
--- a/test/integration/expression-tests/within/meridian-issue-line-1/test.json
+++ b/test/integration/expression-tests/within/meridian-issue-line-1/test.json
@@ -1,44 +1,42 @@
 {
-  "expression": ["within", {
+  "expression": [
+    "within",
+    {
       "type": "Polygon",
       "coordinates": [[[-190, 0], [-178, 0], [-178, 10], [-190, 10], [-190, 0]]]
-    }],
-  "inputs": [[{
-        "zoom": 0,
-        "canonicalID": {
-          "z": 0,
-          "x": 0,
-          "y": 0
-        }
-      }, {
+    }
+  ],
+  "inputs": [
+    [
+      {"zoom": 0, "canonicalID": {"z": 0, "x": 0, "y": 0}},
+      {
         "geometry": {
           "type": "LineString",
           "coordinates": [[-183, 5], [-179, 1]]
         }
-      }], [{
-        "zoom": 0,
-        "canonicalID": {
-          "z": 0,
-          "x": 0,
-          "y": 0
-        }
-      }, {
-        "geometry": {
-          "type": "LineString",
-          "coordinates": [[-183, 5], [181, 1]]
-        }
-      }]],
+      }
+    ],
+    [
+      {"zoom": 0, "canonicalID": {"z": 0, "x": 0, "y": 0}},
+      {"geometry": {"type": "LineString", "coordinates": [[-183, 5], [181, 1]]}}
+    ]
+  ],
   "expected": {
     "compiled": {
-      "type": "boolean",
+      "result": "success",
       "isFeatureConstant": false,
       "isZoomConstant": true,
-      "result": "success"
+      "type": "boolean"
     },
     "outputs": [true, false],
-    "serialized": ["within", {
-        "coordinates": [[[-190, 0], [-178, 0], [-178, 10], [-190, 10], [-190, 0]]],
-        "type": "Polygon"
-      }]
+    "serialized": [
+      "within",
+      {
+        "type": "Polygon",
+        "coordinates": [
+          [[-190, 0], [-178, 0], [-178, 10], [-190, 10], [-190, 0]]
+        ]
+      }
+    ]
   }
 }
diff --git a/test/integration/expression-tests/within/meridian-issue-line-2/test.json b/test/integration/expression-tests/within/meridian-issue-line-2/test.json
index 0e73e0b7e20..e95288f7ba4 100644
--- a/test/integration/expression-tests/within/meridian-issue-line-2/test.json
+++ b/test/integration/expression-tests/within/meridian-issue-line-2/test.json
@@ -1,56 +1,58 @@
 {
-  "expression": ["within", {
+  "expression": [
+    "within",
+    {
       "type": "Polygon",
-      "coordinates": [[[-185.0, 60.0], [175.0, 60.0], [175.0, 65.0], [-185.0, 65.0], [-185.0, 60.0]]]
-    }],
-  "inputs": [[{
-        "zoom": 0,
-        "canonicalID": {
-          "z": 0,
-          "x": 0,
-          "y": 0
-        }
-      }, {
+      "coordinates": [
+        [[-185, 60], [175, 60], [175, 65], [-185, 65], [-185, 60]]
+      ]
+    }
+  ],
+  "inputs": [
+    [
+      {"zoom": 0, "canonicalID": {"z": 0, "x": 0, "y": 0}},
+      {
         "geometry": {
           "type": "LineString",
           "coordinates": [[-183, 61], [-179, 62]]
         }
-      }], [{
-        "zoom": 0,
-        "canonicalID": {
-          "z": 0,
-          "x": 0,
-          "y": 0
-        }
-      }, {
+      }
+    ],
+    [
+      {"zoom": 0, "canonicalID": {"z": 0, "x": 0, "y": 0}},
+      {
         "geometry": {
           "type": "LineString",
           "coordinates": [[-183, 61], [181, 63]]
         }
-      }], [{
-        "zoom": 0,
-        "canonicalID": {
-          "z": 0,
-          "x": 0,
-          "y": 0
-        }
-      }, {
+      }
+    ],
+    [
+      {"zoom": 0, "canonicalID": {"z": 0, "x": 0, "y": 0}},
+      {
         "geometry": {
           "type": "LineString",
           "coordinates": [[-183, 62], [55, 63.5]]
         }
-      }]],
+      }
+    ]
+  ],
   "expected": {
     "compiled": {
-      "type": "boolean",
+      "result": "success",
       "isFeatureConstant": false,
       "isZoomConstant": true,
-      "result": "success"
+      "type": "boolean"
     },
     "outputs": [true, false, true],
-    "serialized": ["within", {
-        "coordinates": [[[-185.0, 60.0], [175.0, 60.0], [175.0, 65.0], [-185.0, 65.0], [-185.0, 60.0]]],
-        "type": "Polygon"
-      }]
+    "serialized": [
+      "within",
+      {
+        "type": "Polygon",
+        "coordinates": [
+          [[-185, 60], [175, 60], [175, 65], [-185, 65], [-185, 60]]
+        ]
+      }
+    ]
   }
 }
diff --git a/test/integration/expression-tests/within/meridian-issue-point-1/test.json b/test/integration/expression-tests/within/meridian-issue-point-1/test.json
index d86e6bcee01..df1e0cae56c 100644
--- a/test/integration/expression-tests/within/meridian-issue-point-1/test.json
+++ b/test/integration/expression-tests/within/meridian-issue-point-1/test.json
@@ -1,56 +1,53 @@
 {
-  "expression": ["within", {
+  "expression": [
+    "within",
+    {
       "type": "Polygon",
-      "coordinates": [[[-185.0, 60.0], [-175.0, 60.0], [-175.0, 65.0], [-185.0, 65.0], [-185.0, 60.0]]]
-    }],
-  "inputs": [[{
-        "zoom": 0,
-        "canonicalID": {
-          "z": 0,
-          "x": 0,
-          "y": 0
-        }
-      }, {
+      "coordinates": [
+        [[-185, 60], [-175, 60], [-175, 65], [-185, 65], [-185, 60]]
+      ]
+    }
+  ],
+  "inputs": [
+    [
+      {"zoom": 0, "canonicalID": {"z": 0, "x": 0, "y": 0}},
+      {
         "geometry": {
           "type": "MultiPoint",
           "coordinates": [[-183, 62], [-179, 63]]
         }
-      }], [{
-        "zoom": 0,
-        "canonicalID": {
-          "z": 0,
-          "x": 0,
-          "y": 0
-        }
-      }, {
+      }
+    ],
+    [
+      {"zoom": 0, "canonicalID": {"z": 0, "x": 0, "y": 0}},
+      {
         "geometry": {
           "type": "MultiPoint",
           "coordinates": [[-183, 62], [181, 63]]
         }
-      }], [{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 7,
-          "y": 2
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [177, 62.5]
-        }
-      }]],
+      }
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 7, "y": 2}},
+      {"geometry": {"type": "Point", "coordinates": [177, 62.5]}}
+    ]
+  ],
   "expected": {
     "compiled": {
-      "type": "boolean",
+      "result": "success",
       "isFeatureConstant": false,
       "isZoomConstant": true,
-      "result": "success"
+      "type": "boolean"
     },
     "outputs": [true, true, true],
-    "serialized": ["within", {
-        "coordinates": [[[-185.0, 60.0], [-175.0, 60.0], [-175.0, 65.0], [-185.0, 65.0], [-185.0, 60.0]]],
-        "type": "Polygon"
-      }]
+    "serialized": [
+      "within",
+      {
+        "type": "Polygon",
+        "coordinates": [
+          [[-185, 60], [-175, 60], [-175, 65], [-185, 65], [-185, 60]]
+        ]
+      }
+    ]
   }
 }
diff --git a/test/integration/expression-tests/within/meridian-issue-point-2/test.json b/test/integration/expression-tests/within/meridian-issue-point-2/test.json
index 0a7a524f847..c8ac3333ab2 100644
--- a/test/integration/expression-tests/within/meridian-issue-point-2/test.json
+++ b/test/integration/expression-tests/within/meridian-issue-point-2/test.json
@@ -1,68 +1,43 @@
 {
-  "expression": ["within", {
+  "expression": [
+    "within",
+    {
       "type": "Polygon",
-      "coordinates": [[[-360.0, 60.0], [0.0, 60.0], [0.0, 65.0], [-360.0, 65.0], [-360.0, 60.0]]]
-    }],
-  "inputs": [[{
-        "zoom": 0,
-        "canonicalID": {
-          "z": 0,
-          "x": 0,
-          "y": 0
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [-183, 61]
-        }
-      }], [{
-        "zoom": 0,
-        "canonicalID": {
-          "z": 0,
-          "x": 0,
-          "y": 0
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [-361, 61]
-        }
-      }], [{
-        "zoom": 0,
-        "canonicalID": {
-          "z": 0,
-          "x": 0,
-          "y": 0
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [183, 62]
-        }
-      }], [{
-        "zoom": 0,
-        "canonicalID": {
-          "z": 0,
-          "x": 0,
-          "y": 0
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [55, 62]
-        }
-      }]],
+      "coordinates": [[[-360, 60], [0, 60], [0, 65], [-360, 65], [-360, 60]]]
+    }
+  ],
+  "inputs": [
+    [
+      {"zoom": 0, "canonicalID": {"z": 0, "x": 0, "y": 0}},
+      {"geometry": {"type": "Point", "coordinates": [-183, 61]}}
+    ],
+    [
+      {"zoom": 0, "canonicalID": {"z": 0, "x": 0, "y": 0}},
+      {"geometry": {"type": "Point", "coordinates": [-361, 61]}}
+    ],
+    [
+      {"zoom": 0, "canonicalID": {"z": 0, "x": 0, "y": 0}},
+      {"geometry": {"type": "Point", "coordinates": [183, 62]}}
+    ],
+    [
+      {"zoom": 0, "canonicalID": {"z": 0, "x": 0, "y": 0}},
+      {"geometry": {"type": "Point", "coordinates": [55, 62]}}
+    ]
+  ],
   "expected": {
     "compiled": {
-      "type": "boolean",
+      "result": "success",
       "isFeatureConstant": false,
       "isZoomConstant": true,
-      "result": "success"
+      "type": "boolean"
     },
     "outputs": [true, true, true, true],
-    "serialized": ["within", {
-        "coordinates": [[[-360.0, 60.0], [0.0, 60.0], [0.0, 65.0], [-360.0, 65.0], [-360.0, 60.0]]],
-        "type": "Polygon"
-      }]
+    "serialized": [
+      "within",
+      {
+        "type": "Polygon",
+        "coordinates": [[[-360, 60], [0, 60], [0, 65], [-360, 65], [-360, 60]]]
+      }
+    ]
   }
 }
diff --git a/test/integration/expression-tests/within/non-supported/test.json b/test/integration/expression-tests/within/non-supported/test.json
index 5e12eb4b1a4..e662851eb42 100644
--- a/test/integration/expression-tests/within/non-supported/test.json
+++ b/test/integration/expression-tests/within/non-supported/test.json
@@ -1,32 +1,36 @@
 {
-  "expression": ["within", {
+  "expression": [
+    "within",
+    {
       "type": "Polygon",
       "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]]
-    }],
-  "inputs": [[{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
+    }
+  ],
+  "inputs": [
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {
         "geometry": {
           "type": "Polygon",
           "coordinates": [[[3, 3], [4, 3], [4, 4], [3, 4], [3, 3]]]
         }
-      }]],
+      }
+    ]
+  ],
   "expected": {
     "compiled": {
-      "type": "boolean",
+      "result": "success",
       "isFeatureConstant": false,
       "isZoomConstant": true,
-      "result": "success"
+      "type": "boolean"
     },
     "outputs": [false],
-    "serialized": ["within", {
-        "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
-        "type": "Polygon"
-      }]
+    "serialized": [
+      "within",
+      {
+        "type": "Polygon",
+        "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]]
+      }
+    ]
   }
 }
diff --git a/test/integration/expression-tests/within/point-on-boundary-1/test.json b/test/integration/expression-tests/within/point-on-boundary-1/test.json
index 8716649bd85..884dfd3fa8e 100644
--- a/test/integration/expression-tests/within/point-on-boundary-1/test.json
+++ b/test/integration/expression-tests/within/point-on-boundary-1/test.json
@@ -1,248 +1,123 @@
 {
-  "expression": ["within", {
+  "expression": [
+    "within",
+    {
       "type": "Polygon",
       "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]]
-    }],
-  "inputs": [[{
-        "zoom": 0,
-        "canonicalID": {
-          "z": 0,
-          "x": 0,
-          "y": 0
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 1,
-        "canonicalID": {
-          "z": 1,
-          "x": 1,
-          "y": 1
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 2,
-        "canonicalID": {
-          "z": 2,
-          "x": 2,
-          "y": 2
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 4,
-        "canonicalID": {
-          "z": 4,
-          "x": 1,
-          "y": 1
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 5,
-        "canonicalID": {
-          "z": 5,
-          "x": 16,
-          "y": 16
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 6,
-        "canonicalID": {
-          "z": 6,
-          "x": 32,
-          "y": 32
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 7,
-        "canonicalID": {
-          "z": 7,
-          "x": 65,
-          "y": 63
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 8,
-        "canonicalID": {
-          "z": 8,
-          "x": 131,
-          "y": 124
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 9,
-        "canonicalID": {
-          "z": 9,
-          "x": 263,
-          "y": 248
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 10,
-        "canonicalID": {
-          "z": 10,
-          "x": 526,
-          "y": 497
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 11,
-        "canonicalID": {
-          "z": 11,
-          "x": 1052,
-          "y": 995
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 12,
-        "canonicalID": {
-          "z": 12,
-          "x": 2104,
-          "y": 1991
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 13,
-        "canonicalID": {
-          "z": 13,
-          "x": 4209,
-          "y": 3982
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 14,
-        "canonicalID": {
-          "z": 14,
-          "x": 8419,
-          "y": 7964
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 15,
-        "canonicalID": {
-          "z": 15,
-          "x": 16839,
-          "y": 15928
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 16,
-        "canonicalID": {
-          "z": 16,
-          "x": 33678,
-          "y": 31856
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 17,
-        "canonicalID": {
-          "z": 17,
-          "x": 67356,
-          "y": 67313
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }], [{
-        "zoom": 18,
-        "canonicalID": {
-          "z": 18,
-          "x": 134712,
-          "y": 127426
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [5, 5]
-        }
-      }]],
+    }
+  ],
+  "inputs": [
+    [
+      {"zoom": 0, "canonicalID": {"z": 0, "x": 0, "y": 0}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 1, "canonicalID": {"z": 1, "x": 1, "y": 1}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 2, "canonicalID": {"z": 2, "x": 2, "y": 2}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 4, "canonicalID": {"z": 4, "x": 1, "y": 1}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 5, "canonicalID": {"z": 5, "x": 16, "y": 16}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 6, "canonicalID": {"z": 6, "x": 32, "y": 32}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 7, "canonicalID": {"z": 7, "x": 65, "y": 63}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 8, "canonicalID": {"z": 8, "x": 131, "y": 124}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 9, "canonicalID": {"z": 9, "x": 263, "y": 248}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 10, "canonicalID": {"z": 10, "x": 526, "y": 497}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 11, "canonicalID": {"z": 11, "x": 1052, "y": 995}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 12, "canonicalID": {"z": 12, "x": 2104, "y": 1991}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 13, "canonicalID": {"z": 13, "x": 4209, "y": 3982}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 14, "canonicalID": {"z": 14, "x": 8419, "y": 7964}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 15, "canonicalID": {"z": 15, "x": 16839, "y": 15928}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 16, "canonicalID": {"z": 16, "x": 33678, "y": 31856}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 17, "canonicalID": {"z": 17, "x": 67356, "y": 67313}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ],
+    [
+      {"zoom": 18, "canonicalID": {"z": 18, "x": 134712, "y": 127426}},
+      {"geometry": {"type": "Point", "coordinates": [5, 5]}}
+    ]
+  ],
   "expected": {
     "compiled": {
-      "type": "boolean",
+      "result": "success",
       "isFeatureConstant": false,
       "isZoomConstant": true,
-      "result": "success"
+      "type": "boolean"
     },
-    "outputs": [false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false ],
-    "serialized": ["within", {
-        "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
-        "type": "Polygon"
-      }]
+    "outputs": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ],
+    "serialized": [
+      "within",
+      {
+        "type": "Polygon",
+        "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]]
+      }
+    ]
   }
 }
diff --git a/test/integration/expression-tests/within/point-on-boundary-2/test.json b/test/integration/expression-tests/within/point-on-boundary-2/test.json
index 7e67501ce44..ac4d91eb9d4 100644
--- a/test/integration/expression-tests/within/point-on-boundary-2/test.json
+++ b/test/integration/expression-tests/within/point-on-boundary-2/test.json
@@ -1,248 +1,123 @@
 {
-  "expression": ["within", {
+  "expression": [
+    "within",
+    {
       "type": "Polygon",
       "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]]
-    }],
-  "inputs": [[{
-        "zoom": 0,
-        "canonicalID": {
-          "z": 0,
-          "x": 0,
-          "y": 0
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 1,
-        "canonicalID": {
-          "z": 1,
-          "x": 1,
-          "y": 1
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 2,
-        "canonicalID": {
-          "z": 2,
-          "x": 2,
-          "y": 2
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 4,
-        "canonicalID": {
-          "z": 4,
-          "x": 1,
-          "y": 1
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 5,
-        "canonicalID": {
-          "z": 5,
-          "x": 16,
-          "y": 16
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 6,
-        "canonicalID": {
-          "z": 6,
-          "x": 32,
-          "y": 32
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 7,
-        "canonicalID": {
-          "z": 7,
-          "x": 65,
-          "y": 63
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 8,
-        "canonicalID": {
-          "z": 8,
-          "x": 131,
-          "y": 126
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 9,
-        "canonicalID": {
-          "z": 9,
-          "x": 261,
-          "y": 261
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 10,
-        "canonicalID": {
-          "z": 10,
-          "x": 512,
-          "y": 503
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 11,
-        "canonicalID": {
-          "z": 11,
-          "x": 1024,
-          "y": 1006
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 12,
-        "canonicalID": {
-          "z": 12,
-          "x": 2048,
-          "y": 2013
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 13,
-        "canonicalID": {
-          "z": 13,
-          "x": 4096,
-          "y": 4027
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 14,
-        "canonicalID": {
-          "z": 14,
-          "x": 8192,
-          "y": 8055
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 15,
-        "canonicalID": {
-          "z": 15,
-          "x": 16384,
-          "y": 16110
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 16,
-        "canonicalID": {
-          "z": 16,
-          "x": 32768,
-          "y": 32221
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 17,
-        "canonicalID": {
-          "z": 17,
-          "x": 65536,
-          "y": 64443
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }], [{
-        "zoom": 18,
-        "canonicalID": {
-          "z": 18,
-          "x": 131072,
-          "y": 128888
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [0, 3]
-        }
-      }]],
+    }
+  ],
+  "inputs": [
+    [
+      {"zoom": 0, "canonicalID": {"z": 0, "x": 0, "y": 0}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 1, "canonicalID": {"z": 1, "x": 1, "y": 1}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 2, "canonicalID": {"z": 2, "x": 2, "y": 2}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 4, "canonicalID": {"z": 4, "x": 1, "y": 1}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 5, "canonicalID": {"z": 5, "x": 16, "y": 16}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 6, "canonicalID": {"z": 6, "x": 32, "y": 32}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 7, "canonicalID": {"z": 7, "x": 65, "y": 63}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 8, "canonicalID": {"z": 8, "x": 131, "y": 126}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 9, "canonicalID": {"z": 9, "x": 261, "y": 261}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 10, "canonicalID": {"z": 10, "x": 512, "y": 503}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 11, "canonicalID": {"z": 11, "x": 1024, "y": 1006}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 12, "canonicalID": {"z": 12, "x": 2048, "y": 2013}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 13, "canonicalID": {"z": 13, "x": 4096, "y": 4027}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 14, "canonicalID": {"z": 14, "x": 8192, "y": 8055}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 15, "canonicalID": {"z": 15, "x": 16384, "y": 16110}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 16, "canonicalID": {"z": 16, "x": 32768, "y": 32221}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 17, "canonicalID": {"z": 17, "x": 65536, "y": 64443}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ],
+    [
+      {"zoom": 18, "canonicalID": {"z": 18, "x": 131072, "y": 128888}},
+      {"geometry": {"type": "Point", "coordinates": [0, 3]}}
+    ]
+  ],
   "expected": {
     "compiled": {
-      "type": "boolean",
+      "result": "success",
       "isFeatureConstant": false,
       "isZoomConstant": true,
-      "result": "success"
+      "type": "boolean"
     },
-    "outputs": [false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false ],
-    "serialized": ["within", {
-        "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
-        "type": "Polygon"
-      }]
+    "outputs": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ],
+    "serialized": [
+      "within",
+      {
+        "type": "Polygon",
+        "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]]
+      }
+    ]
   }
 }
diff --git a/test/integration/expression-tests/within/point-on-boundary-3/test.json b/test/integration/expression-tests/within/point-on-boundary-3/test.json
index 15ae0528d04..4658c22fc2f 100644
--- a/test/integration/expression-tests/within/point-on-boundary-3/test.json
+++ b/test/integration/expression-tests/within/point-on-boundary-3/test.json
@@ -1,248 +1,125 @@
 {
-  "expression": ["within", {
+  "expression": [
+    "within",
+    {
       "type": "Polygon",
       "coordinates": [[[-10, -10], [10, -10], [10, 10], [-10, 10], [-10, -10]]]
-    }],
-  "inputs": [[{
-        "zoom": 0,
-        "canonicalID": {
-          "z": 0,
-          "x": 0,
-          "y": 0
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 1,
-        "canonicalID": {
-          "z": 1,
-          "x": 1,
-          "y": 1
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 2,
-        "canonicalID": {
-          "z": 2,
-          "x": 2,
-          "y": 2
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 4,
-        "canonicalID": {
-          "z": 4,
-          "x": 1,
-          "y": 1
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 5,
-        "canonicalID": {
-          "z": 5,
-          "x": 16,
-          "y": 16
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 6,
-        "canonicalID": {
-          "z": 6,
-          "x": 32,
-          "y": 32
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 7,
-        "canonicalID": {
-          "z": 7,
-          "x": 65,
-          "y": 63
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 8,
-        "canonicalID": {
-          "z": 8,
-          "x": 135,
-          "y": 135
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 9,
-        "canonicalID": {
-          "z": 9,
-          "x": 270,
-          "y": 270
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 10,
-        "canonicalID": {
-          "z": 10,
-          "x": 540,
-          "y": 540
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 11,
-        "canonicalID": {
-          "z": 11,
-          "x": 1080,
-          "y": 1081
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 12,
-        "canonicalID": {
-          "z": 12,
-          "x": 2161,
-          "y": 2162
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 13,
-        "canonicalID": {
-          "z": 13,
-          "x": 4323,
-          "y": 4324
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 14,
-        "canonicalID": {
-          "z": 14,
-          "x": 8650,
-          "y": 8650
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 15,
-        "canonicalID": {
-          "z": 15,
-          "x": 17295,
-          "y": 17298
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 16,
-        "canonicalID": {
-          "z": 16,
-          "x": 34588,
-          "y": 34597
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 17,
-        "canonicalID": {
-          "z": 17,
-          "x": 69176,
-          "y": 69195
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }], [{
-        "zoom": 18,
-        "canonicalID": {
-          "z": 18,
-          "x": 138353,
-          "y": 138391
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [10, -10]
-        }
-      }]],
+    }
+  ],
+  "inputs": [
+    [
+      {"zoom": 0, "canonicalID": {"z": 0, "x": 0, "y": 0}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 1, "canonicalID": {"z": 1, "x": 1, "y": 1}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 2, "canonicalID": {"z": 2, "x": 2, "y": 2}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 4, "canonicalID": {"z": 4, "x": 1, "y": 1}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 5, "canonicalID": {"z": 5, "x": 16, "y": 16}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 6, "canonicalID": {"z": 6, "x": 32, "y": 32}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 7, "canonicalID": {"z": 7, "x": 65, "y": 63}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 8, "canonicalID": {"z": 8, "x": 135, "y": 135}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 9, "canonicalID": {"z": 9, "x": 270, "y": 270}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 10, "canonicalID": {"z": 10, "x": 540, "y": 540}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 11, "canonicalID": {"z": 11, "x": 1080, "y": 1081}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 12, "canonicalID": {"z": 12, "x": 2161, "y": 2162}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 13, "canonicalID": {"z": 13, "x": 4323, "y": 4324}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 14, "canonicalID": {"z": 14, "x": 8650, "y": 8650}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 15, "canonicalID": {"z": 15, "x": 17295, "y": 17298}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 16, "canonicalID": {"z": 16, "x": 34588, "y": 34597}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 17, "canonicalID": {"z": 17, "x": 69176, "y": 69195}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ],
+    [
+      {"zoom": 18, "canonicalID": {"z": 18, "x": 138353, "y": 138391}},
+      {"geometry": {"type": "Point", "coordinates": [10, -10]}}
+    ]
+  ],
   "expected": {
     "compiled": {
-      "type": "boolean",
+      "result": "success",
       "isFeatureConstant": false,
       "isZoomConstant": true,
-      "result": "success"
+      "type": "boolean"
     },
-    "outputs": [false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false ],
-    "serialized": ["within", {
-        "coordinates": [[[-10, -10], [10, -10], [10, 10], [-10, 10], [-10, -10]]],
-        "type": "Polygon"
-      }]
+    "outputs": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ],
+    "serialized": [
+      "within",
+      {
+        "type": "Polygon",
+        "coordinates": [
+          [[-10, -10], [10, -10], [10, 10], [-10, 10], [-10, -10]]
+        ]
+      }
+    ]
   }
 }
diff --git a/test/integration/expression-tests/within/point-within-polygon/test.json b/test/integration/expression-tests/within/point-within-polygon/test.json
index 8da9fbdceec..d372bfebfcf 100644
--- a/test/integration/expression-tests/within/point-within-polygon/test.json
+++ b/test/integration/expression-tests/within/point-within-polygon/test.json
@@ -1,44 +1,35 @@
 {
-  "expression": ["within", {
+  "expression": [
+    "within",
+    {
       "type": "Polygon",
       "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]]
-    }],
-  "inputs": [[{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [6, 6]
-        }
-      }], [{
-        "zoom": 3,
-        "canonicalID": {
-          "z": 3,
-          "x": 3,
-          "y": 3
-        }
-      }, {
-        "geometry": {
-          "type": "Point",
-          "coordinates": [2, 2]
-        }
-      }]],
+    }
+  ],
+  "inputs": [
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "Point", "coordinates": [6, 6]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "Point", "coordinates": [2, 2]}}
+    ]
+  ],
   "expected": {
     "compiled": {
-      "type": "boolean",
+      "result": "success",
       "isFeatureConstant": false,
       "isZoomConstant": true,
-      "result": "success"
+      "type": "boolean"
     },
     "outputs": [false, true],
-    "serialized": ["within", {
-        "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
-        "type": "Polygon"
-      }]
+    "serialized": [
+      "within",
+      {
+        "type": "Polygon",
+        "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]]
+      }
+    ]
   }
 }
diff --git a/test/integration/expression-tests/within/point-within-polygons/test.json b/test/integration/expression-tests/within/point-within-polygons/test.json
index 29f10acb40d..65f69c25393 100644
--- a/test/integration/expression-tests/within/point-within-polygons/test.json
+++ b/test/integration/expression-tests/within/point-within-polygons/test.json
@@ -1,106 +1,61 @@
 {
-    "expression": ["within", {
-        "type": "MultiPolygon",
-        "coordinates": [[[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
-                       [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]]
-      }],
-    "inputs": [[{
-          "zoom": 3,
-          "canonicalID": {
-            "z": 3,
-            "x": 3,
-            "y": 3
-          }
-        }, {
-          "geometry": {
-            "type": "Point",
-            "coordinates": [6, 6]
-          }
-        }], [{
-          "zoom": 3,
-          "canonicalID": {
-            "z": 3,
-            "x": 3,
-            "y": 3
-          }
-        }, {
-          "geometry": {
-            "type": "Point",
-            "coordinates": [2, 2]
-          }
-        }],[{
-            "zoom": 3,
-            "canonicalID": {
-              "z": 3,
-              "x": 3,
-              "y": 3
-            }
-          }, {
-            "geometry": {
-              "type": "Point",
-              "coordinates": [3, 4]
-            }
-          }], [{
-            "zoom": 3,
-            "canonicalID": {
-              "z": 3,
-              "x": 3,
-              "y": 3
-            }
-          }, {
-            "geometry": {
-              "type": "Point",
-              "coordinates": [-1, 3]
-            }
-          }], [{
-            "zoom": 3,
-            "canonicalID": {
-              "z": 3,
-              "x": 0,
-              "y": 1
-            }
-          }, {
-            "geometry": {
-              "type": "Point",
-              "coordinates": [-1, -5]
-            }
-          }], [{
-            "zoom": 3,
-            "canonicalID": {
-              "z": 5,
-              "x": 3,
-              "y": 3
-            }
-          }, {
-            "geometry": {
-              "type": "Point",
-              "coordinates": [2, -2]
-            }
-          }], [{
-            "zoom": 3,
-            "canonicalID": {
-              "z": 2,
-              "x": 0,
-              "y": 1
-            }
-          }, {
-            "geometry": {
-              "type": "Point",
-              "coordinates": [-2, -2]
-            }
-          }]],
-    "expected": {
-      "compiled": {
-        "type": "boolean",
-        "isFeatureConstant": false,
-        "isZoomConstant": true,
-        "result": "success"
-      },
-      "outputs": [false, true, true, false, false, false, true],
-      "serialized": ["within", {
-          "coordinates": [[[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]], [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]],
-          "type": "MultiPolygon" 
-        }]
+  "expression": [
+    "within",
+    {
+      "type": "MultiPolygon",
+      "coordinates": [
+        [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
+        [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]
+      ]
     }
+  ],
+  "inputs": [
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "Point", "coordinates": [6, 6]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "Point", "coordinates": [2, 2]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "Point", "coordinates": [3, 4]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "Point", "coordinates": [-1, 3]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 0, "y": 1}},
+      {"geometry": {"type": "Point", "coordinates": [-1, -5]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 5, "x": 3, "y": 3}},
+      {"geometry": {"type": "Point", "coordinates": [2, -2]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 2, "x": 0, "y": 1}},
+      {"geometry": {"type": "Point", "coordinates": [-2, -2]}}
+    ]
+  ],
+  "expected": {
+    "compiled": {
+      "result": "success",
+      "isFeatureConstant": false,
+      "isZoomConstant": true,
+      "type": "boolean"
+    },
+    "outputs": [false, true, true, false, false, false, true],
+    "serialized": [
+      "within",
+      {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
+          [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]
+        ]
+      }
+    ]
   }
-  
\ No newline at end of file
+}
diff --git a/test/integration/expression-tests/within/points-within-polygon/test.json b/test/integration/expression-tests/within/points-within-polygon/test.json
index 6f2f45def7a..63367f13911 100644
--- a/test/integration/expression-tests/within/points-within-polygon/test.json
+++ b/test/integration/expression-tests/within/points-within-polygon/test.json
@@ -1,45 +1,40 @@
 {
-    "expression": ["within", {
+  "expression": [
+    "within",
+    {
+      "type": "Polygon",
+      "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]]
+    }
+  ],
+  "inputs": [
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {
+        "geometry": {
+          "type": "MultiPoint",
+          "coordinates": [[6, 6], [3, 4], [2, 2]]
+        }
+      }
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "MultiPoint", "coordinates": [[2, 2], [3, 3]]}}
+    ]
+  ],
+  "expected": {
+    "compiled": {
+      "result": "success",
+      "isFeatureConstant": false,
+      "isZoomConstant": true,
+      "type": "boolean"
+    },
+    "outputs": [false, true],
+    "serialized": [
+      "within",
+      {
         "type": "Polygon",
         "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]]
-      }],
-    "inputs": [[{
-          "zoom": 3,
-          "canonicalID": {
-            "z": 3,
-            "x": 3,
-            "y": 3
-          }
-        }, {
-          "geometry": {
-            "type": "MultiPoint",
-            "coordinates": [[6, 6], [3, 4], [2, 2]]
-          }
-        }], [{
-          "zoom": 3,
-          "canonicalID": {
-            "z": 3,
-            "x": 3,
-            "y": 3
-          }
-        }, {
-          "geometry": {
-            "type": "MultiPoint",
-            "coordinates": [[2, 2], [3, 3]]
-          }
-        }]],
-    "expected": {
-      "compiled": {
-        "type": "boolean",
-        "isFeatureConstant": false,
-        "isZoomConstant": true,
-        "result": "success"
-      },
-      "outputs": [false, true],
-      "serialized": ["within", {
-          "coordinates": [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
-          "type": "Polygon"
-        }]
-    }
+      }
+    ]
   }
-  
\ No newline at end of file
+}
diff --git a/test/integration/expression-tests/within/points-within-polygons/test.json b/test/integration/expression-tests/within/points-within-polygons/test.json
index c170f6134b7..e89e65a23a9 100644
--- a/test/integration/expression-tests/within/points-within-polygons/test.json
+++ b/test/integration/expression-tests/within/points-within-polygons/test.json
@@ -1,94 +1,62 @@
 {
-    "expression": ["within", {
-        "type": "MultiPolygon",
-        "coordinates": [[[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
-                       [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]]
-      }],
-    "inputs": [[{
-          "zoom": 3,
-          "canonicalID": {
-            "z": 3,
-            "x": 3,
-            "y": 3
-          }
-        }, {
-          "geometry": {
-            "type": "MultiPoint",
-            "coordinates": [[6, 6], [2, 2]]
-          }
-        }], [{
-          "zoom": 3,
-          "canonicalID": {
-            "z": 3,
-            "x": 3,
-            "y": 3
-          }
-        }, {
-          "geometry": {
-            "type": "MultiPoint",
-            "coordinates": [[2, 2], [3, 3]]
-          }
-        }],[{
-            "zoom": 3,
-            "canonicalID": {
-              "z": 3,
-              "x": 3,
-              "y": 3
-            }
-          }, {
-            "geometry": {
-              "type": "MultiPoint",
-              "coordinates": [[3, 4], [-2, -2]]
-            }
-          }], [{
-            "zoom": 3,
-            "canonicalID": {
-              "z": 3,
-              "x": 3,
-              "y": 3
-            }
-          }, {
-            "geometry": {
-              "type": "MultiPoint",
-              "coordinates": [[-1, 3], [1, 3]]
-            }
-          }], [{
-            "zoom": 3,
-            "canonicalID": {
-              "z": 3,
-              "x": 0,
-              "y": 1
-            }
-          }, {
-            "geometry": {
-              "type": "MultiPoint",
-              "coordinates": [[2, 3], [-2, 3], [-2, -2]]
-            }
-          }], [{
-            "zoom": 3,
-            "canonicalID": {
-              "z": 5,
-              "x": 15,
-              "y": 16
-            }
-          }, {
-            "geometry": {
-              "type": "MultiPoint",
-              "coordinates": [[-2, -2], [-1, -1]]
-            }
-          }]],
-    "expected": {
-      "compiled": {
-        "type": "boolean",
-        "isFeatureConstant": false,
-        "isZoomConstant": true,
-        "result": "success"
-      },
-      "outputs": [false, true, true, false, false, true],
-      "serialized": ["within", {
-          "coordinates": [[[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]], [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]],
-          "type": "MultiPolygon" 
-        }]
+  "expression": [
+    "within",
+    {
+      "type": "MultiPolygon",
+      "coordinates": [
+        [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
+        [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]
+      ]
     }
+  ],
+  "inputs": [
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "MultiPoint", "coordinates": [[6, 6], [2, 2]]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "MultiPoint", "coordinates": [[2, 2], [3, 3]]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "MultiPoint", "coordinates": [[3, 4], [-2, -2]]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 3, "y": 3}},
+      {"geometry": {"type": "MultiPoint", "coordinates": [[-1, 3], [1, 3]]}}
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 3, "x": 0, "y": 1}},
+      {
+        "geometry": {
+          "type": "MultiPoint",
+          "coordinates": [[2, 3], [-2, 3], [-2, -2]]
+        }
+      }
+    ],
+    [
+      {"zoom": 3, "canonicalID": {"z": 5, "x": 15, "y": 16}},
+      {"geometry": {"type": "MultiPoint", "coordinates": [[-2, -2], [-1, -1]]}}
+    ]
+  ],
+  "expected": {
+    "compiled": {
+      "result": "success",
+      "isFeatureConstant": false,
+      "isZoomConstant": true,
+      "type": "boolean"
+    },
+    "outputs": [false, true, true, false, false, true],
+    "serialized": [
+      "within",
+      {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
+          [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]
+        ]
+      }
+    ]
   }
-  
\ No newline at end of file
+}
diff --git a/test/integration/expression-tests/zoom/nested-let/test.json b/test/integration/expression-tests/zoom/nested-let/test.json
index 480c46aa88f..afacbcc91e6 100644
--- a/test/integration/expression-tests/zoom/nested-let/test.json
+++ b/test/integration/expression-tests/zoom/nested-let/test.json
@@ -14,7 +14,9 @@
       "type": "number"
     },
     "outputs": [
-      {"error": "Expected value to be of type number, but found null instead."}
+      {
+        "error": "The expression [\"get\",\"a\"] evaluated to null but was expected to be of type number."
+      }
     ],
     "serialized": [
       "let",
diff --git a/test/integration/lib/query.js b/test/integration/lib/query.js
index 04d04915629..af1ff974eb3 100644
--- a/test/integration/lib/query.js
+++ b/test/integration/lib/query.js
@@ -95,6 +95,7 @@ async function runTest(t) {
             attributionControl: false,
             preserveDrawingBuffer: true,
             axonometric: options.axonometric || false,
+            precompilePrograms: false,
             skew: options.skew || [0, 0],
             fadeDuration: options.fadeDuration || 0,
             localIdeographFontFamily: options.localIdeographFontFamily || false,
diff --git a/test/integration/lib/render.js b/test/integration/lib/render.js
index 9ac042e0025..6fe43b134f0 100644
--- a/test/integration/lib/render.js
+++ b/test/integration/lib/render.js
@@ -25,7 +25,7 @@ config.REQUIRE_ACCESS_TOKEN = false;
 window._suiteName = 'render-tests';
 
 mapboxgl.prewarm();
-mapboxgl.setRTLTextPlugin('https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.3/mapbox-gl-rtl-text.js');
+mapboxgl.setRTLTextPlugin('https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.3.0/mapbox-gl-rtl-text.js');
 
 //1. Create and position the container, floating at the bottom right
 const container = document.createElement('div');
@@ -196,6 +196,7 @@ async function renderMap(style, options) {
         fadeDuration: options.fadeDuration || 0,
         localIdeographFontFamily: options.localIdeographFontFamily || false,
         projection: options.projection,
+        precompilePrograms: false,
         crossSourceCollisions: typeof options.crossSourceCollisions === "undefined" ? true : options.crossSourceCollisions,
         performanceMetricsCollection: false,
         tessellationStep: options.tessellationStep,
diff --git a/test/integration/render-tests/circle-blur/negative/expected.png b/test/integration/render-tests/circle-blur/negative/expected.png
new file mode 100644
index 00000000000..460bb74ef64
Binary files /dev/null and b/test/integration/render-tests/circle-blur/negative/expected.png differ
diff --git a/test/integration/render-tests/circle-blur/negative/style.json b/test/integration/render-tests/circle-blur/negative/style.json
new file mode 100644
index 00000000000..7314eb60be8
--- /dev/null
+++ b/test/integration/render-tests/circle-blur/negative/style.json
@@ -0,0 +1,54 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 64
+    }
+  },
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [
+          {
+            "type": "Feature",
+            "properties": {
+            },
+            "geometry": {
+              "type": "Point",
+              "coordinates": [
+                -10,
+                0
+              ]
+            }
+          },
+          {
+            "type": "Feature",
+            "properties": {
+            },
+            "geometry": {
+              "type": "Point",
+              "coordinates": [
+                10,
+                0
+              ]
+            }
+          }
+        ]
+      }
+    }
+  },
+  "layers": [
+    {
+      "id": "circle",
+      "type": "circle",
+      "source": "geojson",
+      "paint": {
+        "circle-radius": 10,
+        "circle-blur": -0.5
+      }
+    }
+  ]
+}
diff --git a/test/integration/render-tests/depth-occlusion/line-fill-extrusion-disable-terrain/style.json b/test/integration/render-tests/depth-occlusion/line-fill-extrusion-disable-terrain/style.json
index 11a97832e9d..4f312b367e5 100644
--- a/test/integration/render-tests/depth-occlusion/line-fill-extrusion-disable-terrain/style.json
+++ b/test/integration/render-tests/depth-occlusion/line-fill-extrusion-disable-terrain/style.json
@@ -4,6 +4,7 @@
     "test": {
       "height": 256,
       "width": 256,
+      "allowed": 0.0002,
       "operations": [
         ["wait"],
         ["wait"],
diff --git a/test/integration/render-tests/depth-occlusion/line-fill-extrusion-no-terrain/expected.png b/test/integration/render-tests/depth-occlusion/line-fill-extrusion-no-terrain/expected.png
index 9e9f8f8e9a8..c151ff13afe 100644
Binary files a/test/integration/render-tests/depth-occlusion/line-fill-extrusion-no-terrain/expected.png and b/test/integration/render-tests/depth-occlusion/line-fill-extrusion-no-terrain/expected.png differ
diff --git a/test/integration/render-tests/depth-occlusion/line-fill-extrusion-no-terrain/style.json b/test/integration/render-tests/depth-occlusion/line-fill-extrusion-no-terrain/style.json
index bfc7de96f19..ec9fe47ec8d 100644
--- a/test/integration/render-tests/depth-occlusion/line-fill-extrusion-no-terrain/style.json
+++ b/test/integration/render-tests/depth-occlusion/line-fill-extrusion-no-terrain/style.json
@@ -138,6 +138,32 @@
   "pitch": 60,
   "zoom": 18,
   "layers": [
+    {
+      "id": "line3",
+      "type": "line",
+      "source": "line",
+      "layout": {
+        "line-z-offset": 28
+      },
+      "paint": {
+        "line-color": "rgba(0,128,255,1)",
+        "line-width": 20.0,
+        "line-occlusion-opacity": 0.5
+      }
+    },
+    {
+      "id": "line4",
+      "type": "line",
+      "source": "line",
+      "layout": {
+        "line-z-offset": 26
+      },
+      "paint": {
+        "line-color": "rgba(0,128,255,1)",
+        "line-width": 20.0,
+        "line-occlusion-opacity": 0.5
+      }
+    },
     {
       "id": "line",
       "type": "line",
@@ -155,6 +181,121 @@
       "paint": {
         "fill-extrusion-height": 30
       }
+    },
+    {
+      "id": "line5",
+      "type": "line",
+      "source": "line",
+      "layout": {
+        "line-z-offset": 24
+      },
+      "paint": {
+        "line-color": "rgba(0,128,255,1)",
+        "line-width": 20.0,
+        "line-occlusion-opacity": 0.5
+      }
+    },
+    {
+      "id": "line6",
+      "type": "line",
+      "source": "line",
+      "layout": {
+        "line-z-offset": 22
+      },
+      "paint": {
+        "line-color": "rgba(0,128,255,1)",
+        "line-width": 20.0,
+        "line-occlusion-opacity": 0.5
+      }
+    },
+    {
+      "id": "line2blur1",
+      "type": "line",
+      "source": "line",
+      "layout": {
+        "line-z-offset": 30
+      },
+      "paint": {
+        "line-color": "rgba(0,128,255,1)",
+        "line-width": 35.0,
+        "line-opacity": 0.4,
+        "line-blur": 3,
+        "line-occlusion-opacity": 0.5
+      }
+    },
+    {
+      "id": "line2blur2",
+      "type": "line",
+      "source": "line",
+      "layout": {
+        "line-z-offset": 30
+      },
+      "paint": {
+        "line-color": "rgba(0,128,255,1)",
+        "line-width": 27.0,
+        "line-opacity": 0.4,
+        "line-blur": 2,
+        "line-occlusion-opacity": 0.5
+      }
+    },
+    {
+      "id": "line2",
+      "type": "line",
+      "source": "line",
+      "layout": {
+        "line-z-offset": 30
+      },
+      "paint": {
+        "line-color": "rgba(0,128,255,1)",
+        "line-width": 20.0,
+        "line-occlusion-opacity": 0.5
+      }
+    },
+    {
+      "id": "line1blur1",
+      "type": "line",
+      "source": "line",
+      "layout": {
+        "line-z-offset": 26
+      },
+      "paint": {
+        "line-color": "rgba(0,128,255,1)",
+        "line-width": 35.0,
+        "line-occlusion-opacity": 0.5,
+        "line-translate": [120, 120],
+        "line-opacity": 0.4,
+        "line-blur": 3
+      }
+    },
+    {
+      "id": "line1blur2",
+      "type": "line",
+      "source": "line",
+      "layout": {
+        "line-z-offset": 26
+      },
+      "paint": {
+        "line-color": "rgba(0,128,255,1)",
+        "line-width": 27.0,
+        "line-occlusion-opacity": 0.5,
+        "line-opacity": 0.4,
+        "line-blur": 3,
+        "line-translate": [120, 120]
+      }
+    },
+    {
+      "id": "line1",
+      "type": "line",
+      "source": "line",
+      "layout": {
+        "line-z-offset": 26
+      },
+      "paint": {
+        "line-color": "rgba(0,128,255,1)",
+        "line-width": 20.0,
+        "line-occlusion-opacity": 0.5,
+        "line-translate": [120, 120]
+      }
     }
   ]
 }
diff --git a/test/integration/render-tests/lighting-3d-mode/fill-extrusion/flood-light/landmark-conflation-buckingham/expected.png b/test/integration/render-tests/lighting-3d-mode/fill-extrusion/flood-light/landmark-conflation-buckingham/expected.png
index c9feb0fbdc1..c4d24039df4 100644
Binary files a/test/integration/render-tests/lighting-3d-mode/fill-extrusion/flood-light/landmark-conflation-buckingham/expected.png and b/test/integration/render-tests/lighting-3d-mode/fill-extrusion/flood-light/landmark-conflation-buckingham/expected.png differ
diff --git a/test/integration/render-tests/measure-light/global-brightness-zoom-based-model/expected.png b/test/integration/render-tests/measure-light/global-brightness-zoom-based-model/expected.png
index 303417ffaa5..e84b6c94e0f 100644
Binary files a/test/integration/render-tests/measure-light/global-brightness-zoom-based-model/expected.png and b/test/integration/render-tests/measure-light/global-brightness-zoom-based-model/expected.png differ
diff --git a/test/integration/render-tests/model-layer/landmark-front-cutoff-high-zoom/expected.png b/test/integration/render-tests/model-layer/landmark-front-cutoff-high-zoom/expected.png
index bd2be3c3896..f9089d32ff1 100644
Binary files a/test/integration/render-tests/model-layer/landmark-front-cutoff-high-zoom/expected.png and b/test/integration/render-tests/model-layer/landmark-front-cutoff-high-zoom/expected.png differ
diff --git a/test/integration/render-tests/model-layer/landmark-mbx-meshopt-quantization/shadows-normal-offset/expected.png b/test/integration/render-tests/model-layer/landmark-mbx-meshopt-quantization/shadows-normal-offset/expected.png
index 4a23e030a27..c4a6f950915 100644
Binary files a/test/integration/render-tests/model-layer/landmark-mbx-meshopt-quantization/shadows-normal-offset/expected.png and b/test/integration/render-tests/model-layer/landmark-mbx-meshopt-quantization/shadows-normal-offset/expected.png differ
diff --git a/test/integration/render-tests/model-layer/landmark-mbx-meshopt-quantization/z-offset-v2-port/expected.png b/test/integration/render-tests/model-layer/landmark-mbx-meshopt-quantization/z-offset-v2-port/expected.png
index 4725155a031..0eaa9da1e10 100644
Binary files a/test/integration/render-tests/model-layer/landmark-mbx-meshopt-quantization/z-offset-v2-port/expected.png and b/test/integration/render-tests/model-layer/landmark-mbx-meshopt-quantization/z-offset-v2-port/expected.png differ
diff --git a/test/integration/render-tests/model-layer/landmark-mbx-meshopt-quantization/z-offset-v2-station/expected.png b/test/integration/render-tests/model-layer/landmark-mbx-meshopt-quantization/z-offset-v2-station/expected.png
index 79fa2f10dbd..967d0678285 100644
Binary files a/test/integration/render-tests/model-layer/landmark-mbx-meshopt-quantization/z-offset-v2-station/expected.png and b/test/integration/render-tests/model-layer/landmark-mbx-meshopt-quantization/z-offset-v2-station/expected.png differ
diff --git a/test/integration/render-tests/model-layer/landmark-mbx-shadows/expected.png b/test/integration/render-tests/model-layer/landmark-mbx-shadows/expected.png
index 54106c98b8d..f4e857f1da3 100644
Binary files a/test/integration/render-tests/model-layer/landmark-mbx-shadows/expected.png and b/test/integration/render-tests/model-layer/landmark-mbx-shadows/expected.png differ
diff --git a/test/integration/render-tests/model-layer/landmark-part-styling-indirect-update-doors/expected.png b/test/integration/render-tests/model-layer/landmark-part-styling-indirect-update-doors/expected.png
index 2bd5071c2ed..c35dcf2835e 100644
Binary files a/test/integration/render-tests/model-layer/landmark-part-styling-indirect-update-doors/expected.png and b/test/integration/render-tests/model-layer/landmark-part-styling-indirect-update-doors/expected.png differ
diff --git a/test/integration/render-tests/model-layer/landmark-part-styling-indirect-update/expected.png b/test/integration/render-tests/model-layer/landmark-part-styling-indirect-update/expected.png
index a3d6cdad734..10224c3580b 100644
Binary files a/test/integration/render-tests/model-layer/landmark-part-styling-indirect-update/expected.png and b/test/integration/render-tests/model-layer/landmark-part-styling-indirect-update/expected.png differ
diff --git a/test/integration/render-tests/model-layer/landmark-z-offset-collision-munich-museum/expected.png b/test/integration/render-tests/model-layer/landmark-z-offset-collision-munich-museum/expected.png
index e759df379ba..8a6d6438420 100644
Binary files a/test/integration/render-tests/model-layer/landmark-z-offset-collision-munich-museum/expected.png and b/test/integration/render-tests/model-layer/landmark-z-offset-collision-munich-museum/expected.png differ
diff --git a/test/integration/render-tests/model-layer/landmark-z-offset-munich-hidden-extrusions/expected.png b/test/integration/render-tests/model-layer/landmark-z-offset-munich-hidden-extrusions/expected.png
index 1d0e1daf02d..9ef35cb2636 100644
Binary files a/test/integration/render-tests/model-layer/landmark-z-offset-munich-hidden-extrusions/expected.png and b/test/integration/render-tests/model-layer/landmark-z-offset-munich-hidden-extrusions/expected.png differ
diff --git a/test/integration/render-tests/model-layer/landmark-z-offset-munich-multiple-extrusions/expected.png b/test/integration/render-tests/model-layer/landmark-z-offset-munich-multiple-extrusions/expected.png
index be20de4bb7c..9e17d08f46d 100644
Binary files a/test/integration/render-tests/model-layer/landmark-z-offset-munich-multiple-extrusions/expected.png and b/test/integration/render-tests/model-layer/landmark-z-offset-munich-multiple-extrusions/expected.png differ
diff --git a/test/unit/source/load_tilejson.test.ts b/test/unit/source/load_tilejson.test.ts
index 5261c09db6f..a074f60b47f 100644
--- a/test/unit/source/load_tilejson.test.ts
+++ b/test/unit/source/load_tilejson.test.ts
@@ -1,40 +1,451 @@
 // @ts-nocheck
-import {describe, test, expect} from '../../util/vitest';
+import {vi, beforeAll, afterEach, afterAll, describe, test, expect, doneAsync, assert} from '../../util/vitest';
+import {getNetworkWorker, http, HttpResponse} from '../../util/network';
 import {Evented} from '../../../src/util/evented';
 import loadTileJSON from '../../../src/source/load_tilejson';
+import {RequestManager} from '../../../src/util/mapbox';
 
 class StubMap extends Evented {
     constructor() {
         super();
-        this._requestManager = {
-            canonicalizeTileset: tileJSON => tileJSON.tiles
-        };
+        this._requestManager = new RequestManager();
     }
 }
 
+let networkWorker: any;
+
+beforeAll(async () => {
+    networkWorker = await getNetworkWorker(window);
+});
+
+afterEach(() => {
+    networkWorker.resetHandlers();
+});
+
+afterAll(() => {
+    networkWorker.stop();
+});
+
+describe('Inlined TileJSON', () => {
+    const map = new StubMap();
+    const baseTileJSON = {
+        attribution: '<a href="https://www.mapbox.com/about/maps/" target="_blank"></a>',
+        bounds: [-180, -85, 180, 85],
+        center: [0, 0, 0],
+        format: 'pbf',
+        maxzoom: 16,
+        minzoom: 0,
+        tilejson: '2.2.0',
+        tiles: ['http://example.com/{z}/{x}/{y}.png'],
+        'worldview_default': 'US',
+        'worldview_options': {
+            AR: 'Argentina',
+            CN: 'China',
+            IN: 'India',
+            JP: 'Japan',
+            MA: 'Morocco',
+            RS: 'Serbia',
+            RU: 'Russia',
+            TR: 'Turkey',
+            US: 'United States'
+        }
+    };
+    test('should place inline data without request', async () => {
+        const {withAsync, wait} = doneAsync();
+        const transformSpy = vi.spyOn(map._requestManager, 'transformRequest');
+
+        loadTileJSON({
+            type: 'vector',
+            data: {
+                ...baseTileJSON
+            }
+        }, map._requestManager, null, null, withAsync((err, result, doneRef) => {
+            assert.ifError(err);
+            expect(result.tiles).toEqual(["http://example.com/{z}/{x}/{y}.png"]);
+            expect(transformSpy).not.toHaveBeenCalled();
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
+
+    test('should request tileJSON because of another language', async () => {
+        const {withAsync, wait} = doneAsync();
+        const requestFn = vi.fn();
+        networkWorker.use(
+            http.get('/source.json', () => {
+                requestFn();
+                return HttpResponse.json({});
+            })
+        );
+        loadTileJSON({
+            type: 'vector',
+            data: {
+                ...baseTileJSON,
+                'language_options': {
+                    'fi': 'Finland'
+                },
+                language: {
+                    'mapbox.mapbox-streets-v8': 'fr'
+                }
+            },
+            url: '/source.json'
+        }, map._requestManager, 'fi', null, withAsync((err, result, doneRef) => {
+            assert.ifError(err);
+            expect(requestFn).toHaveBeenCalledOnce();
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
+
+    test('should request tileJSON because of another worldview', async () => {
+        const {withAsync, wait} = doneAsync();
+        const requestFn = vi.fn();
+        networkWorker.use(
+            http.get('/source.json', () => {
+                requestFn();
+                return HttpResponse.json({});
+            })
+        );
+
+        loadTileJSON({
+            type: 'vector',
+            data: {
+                ...baseTileJSON,
+                'language_options': {
+                    'fi': 'Finland',
+                    'us': 'USA'
+                },
+                language: {
+                    'mapbox.mapbox-streets-v8': 'us'
+                },
+                worldview: {
+                    'mapbox.mapbox-streets-v8': 'us'
+                }
+            },
+            url: '/source.json'
+        }, map._requestManager, 'us', 'IN', withAsync((err, result, doneRef) => {
+            assert.ifError(err);
+            expect(requestFn).toHaveBeenCalledOnce();
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
+
+    test('should request tileJSON because of only unsupported language', async () => {
+        const {withAsync, wait} = doneAsync();
+        const requestFn = vi.fn();
+        networkWorker.use(
+            http.get('/source.json', () => {
+                requestFn();
+                return HttpResponse.json({});
+            })
+        );
+
+        loadTileJSON({
+            type: 'vector',
+            data: {
+                ...baseTileJSON,
+                'language_options': {
+                    'fi': 'Finland',
+                    'us': 'USA'
+                },
+                language: {
+                    'mapbox.mapbox-streets-v8': 'us'
+                },
+                worldview: {
+                    'mapbox.mapbox-streets-v8': 'US'
+                }
+            },
+            url: '/source.json'
+        }, map._requestManager, 'et', 'IN', withAsync((err, result, doneRef) => {
+            assert.ifError(err);
+            expect(requestFn).toHaveBeenCalledOnce();
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
+
+    test('should request tileJSON because of only unsupported worldview', async () => {
+        const {withAsync, wait} = doneAsync();
+        const requestFn = vi.fn();
+        networkWorker.use(
+            http.get('/source.json', () => {
+                requestFn();
+                return HttpResponse.json({});
+            })
+        );
+
+        loadTileJSON({
+            type: 'vector',
+            data: {
+                ...baseTileJSON,
+                // eslint-disable-next-line camelcase
+                language_options: {
+                    'fi': 'Finland',
+                    'us': 'USA'
+                },
+                language: {
+                    'mapbox.mapbox-streets-v8': 'us'
+                },
+                // eslint-disable-next-line camelcase
+                worldview_options: {
+                    'IN': 'India'
+                },
+                worldview: {
+                    'mapbox.mapbox-streets-v8': 'us'
+                }
+            },
+            url: '/source.json'
+        }, map._requestManager, 'fi', 'JP', withAsync((err, result, doneRef) => {
+            assert.ifError(err);
+            expect(requestFn).toHaveBeenCalledOnce();
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
+
+    test('should not request tileJSON because of unsupported language/worldview', async () => {
+        const {withAsync, wait} = doneAsync();
+        const requestFn = vi.fn();
+        networkWorker.use(
+            http.get('/source.json', () => {
+                requestFn();
+                return HttpResponse.json({});
+            }),
+        );
+
+        loadTileJSON({
+            type: 'vector',
+            data: {
+                ...baseTileJSON,
+                'language_options': {
+                    'fi': 'Finland',
+                    'us': 'USA'
+                },
+                language: {
+                    'mapbox.mapbox-streets-v8': 'us'
+                },
+                worldview: {
+                    'mapbox.mapbox-streets-v8': 'US'
+                }
+            },
+            url: '/source.json'
+        }, map._requestManager, 'et', 'ET', withAsync((err, result, doneRef) => {
+            assert.ifError(err);
+            expect(requestFn).not.toHaveBeenCalled();
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
+
+    test('should request tileJSON if we don\'t have inlined data', async () => {
+        const {withAsync, wait} = doneAsync();
+        const requestFn = vi.fn();
+        networkWorker.use(
+            http.get('/source.json', () => {
+                requestFn();
+                return HttpResponse.json({});
+            }),
+        );
+
+        loadTileJSON({
+            type: 'vector',
+            url: '/source.json'
+        }, map._requestManager, null, null, withAsync((err, result, doneRef) => {
+            assert.ifError(err);
+            expect(requestFn).toHaveBeenCalledOnce();
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
+
+    test('should request tileJSON if some source of different language', async () => {
+        const {withAsync, wait} = doneAsync();
+        const requestFn = vi.fn();
+        networkWorker.use(
+            http.get('/source.json', () => {
+                requestFn();
+                return HttpResponse.json({});
+            }),
+        );
+
+        loadTileJSON({
+            type: 'vector',
+            data: {
+                ...baseTileJSON,
+                // eslint-disable-next-line camelcase
+                language_options: {
+                    'fi': 'Finland',
+                    'us': 'USA'
+                },
+                language: {
+                    'mapbox.mapbox-streets-v8': 'us',
+                    'mapbox.mapbox-other-v1': 'fi'
+                },
+                worldview: {
+                    'mapbox.mapbox-streets-v8': 'US'
+                }
+            },
+            url: '/source.json'
+        }, map._requestManager, 'fi', null, withAsync((err, result, doneRef) => {
+            assert.ifError(err);
+            expect(requestFn).toHaveBeenCalledOnce();
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
+
+    test('should request tileJSON if some source of different worldview', async () => {
+        const {withAsync, wait} = doneAsync();
+        const requestFn = vi.fn();
+        networkWorker.use(
+            http.get('/source.json', () => {
+                requestFn();
+                return HttpResponse.json({});
+            }),
+        );
+
+        loadTileJSON({
+            type: 'vector',
+            data: {
+                ...baseTileJSON,
+                // eslint-disable-next-line camelcase
+                language_options: {
+                    'fi': 'Finland',
+                    'us': 'USA'
+                },
+                language: {
+                    'mapbox.mapbox-streets-v8': 'us',
+                    'mapbox.mapbox-other-v1': 'us'
+                },
+                worldview: {
+                    'mapbox.mapbox-streets-v8': 'JP',
+                    'mapbox.mapbox-other-v1': 'US'
+                }
+            },
+            url: '/source.json'
+        }, map._requestManager, 'us', 'JP', withAsync((err, result, doneRef) => {
+            assert.ifError(err);
+            expect(requestFn).toHaveBeenCalledOnce();
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
+
+    test('should request tileJSON if we don\'t have language options', async () => {
+        const {withAsync, wait} = doneAsync();
+        const requestFn = vi.fn();
+        networkWorker.use(
+            http.get('/source.json', () => {
+                requestFn();
+                return HttpResponse.json({});
+            }),
+        );
+
+        loadTileJSON({
+            type: 'vector',
+            data: {
+                ...baseTileJSON,
+                // eslint-disable-next-line camelcase
+                language_options: undefined,
+                language: {
+                    'mapbox.mapbox-streets-v8': 'us',
+                    'mapbox.mapbox-other-v1': 'jp'
+                },
+                worldview: {
+                    'mapbox.mapbox-streets-v8': 'JP',
+                    'mapbox.mapbox-other-v1': 'JP'
+                }
+            },
+            url: '/source.json'
+        }, map._requestManager, 'us', 'JP', withAsync((err, result, doneRef) => {
+            assert.ifError(err);
+            expect(requestFn).toHaveBeenCalledOnce();
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
+
+    test('should request tileJSON if we don\'t have worldview options', async () => {
+        const {withAsync, wait} = doneAsync();
+        const requestFn = vi.fn();
+        networkWorker.use(
+            http.get('/source.json', () => {
+                requestFn();
+                return HttpResponse.json({});
+            }),
+        );
+
+        loadTileJSON({
+            type: 'vector',
+            data: {
+                ...baseTileJSON,
+                // eslint-disable-next-line camelcase
+                worldview_options: undefined,
+                language: {
+                    'mapbox.mapbox-streets-v8': 'us',
+                    'mapbox.mapbox-other-v1': 'us'
+                },
+                worldview: {
+                    'mapbox.mapbox-streets-v8': 'JP',
+                    'mapbox.mapbox-other-v1': 'US'
+                }
+            },
+            url: '/source.json'
+        }, map._requestManager, 'us', 'JP', withAsync((err, result, doneRef) => {
+            assert.ifError(err);
+            expect(requestFn).toHaveBeenCalledOnce();
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
+});
 
 describe('LoadTileJson#variants', () => {
     const map = new StubMap();
-    
-    test('returns error if variants is not an array', () => {
-        // variants should be an array
-        let tileJSON = {
+
+    test('should returns error if variants is not an array', async () => {
+        const {withAsync, wait} = doneAsync();
+        const tileJSON = {
             "tiles": ["http://dataset1"],
             "variants": "variants should not be a string"
         };
-        let tileJSONRequest = loadTileJSON(tileJSON, map._requestManager, null, null, (err, result) => {
+        loadTileJSON(tileJSON, map._requestManager, null, null, withAsync((err, doneRef) => {
             expect(err.message).toEqual("variants must be an array");
-        });
-        // variants elements should be objects
-        tileJSON = {
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
+
+    test('should returns error if variant is not an object', async () => {
+        const {withAsync, wait} = doneAsync();
+        const tileJSON = {
             "tiles": ["http://dataset1"],
             "variants": ["variants elements should be objects"]
         };
-        tileJSONRequest = loadTileJSON(tileJSON, map._requestManager, null, null, (err, result) => {
+        loadTileJSON(tileJSON, map._requestManager, null, null, withAsync((err, doneRef) => {
             expect(err.message).toEqual("variant must be an object");
-        });
-        // capabilities should be an array
-        tileJSON = {
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
+
+    test('should returns error if capabilities is not an array', async () => {
+        const {withAsync, wait} = doneAsync();
+        const tileJSON = {
             "tiles": ["http://dataset1"],
             "variants": [
                 {
@@ -42,11 +453,21 @@ describe('LoadTileJson#variants', () => {
                 }
             ]
         };
-        tileJSONRequest = loadTileJSON(tileJSON, map._requestManager, null, null, (err, result) => {
+        loadTileJSON(tileJSON, map._requestManager, null, null, withAsync((err, doneRef) => {
             expect(err.message).toEqual("capabilities must be an array");
-        });
-        // tiles should be replaced if capabilities.lenght == 1 and capabilities[0]== "meshopt"
-        tileJSON = {
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
+
+    test('tiles should be replaced if capabilities.length == 1 and capabilities[0] == "meshopt" ', async() => {
+        const {withAsync, wait} = doneAsync();
+        const options = {
+            url: "/source.json"
+        };
+
+        const tileJSON = {
             "tiles": ["http://dataset1"],
             "variants": [
                 {
@@ -55,12 +476,29 @@ describe('LoadTileJson#variants', () => {
                 }
             ]
         };
-        tileJSONRequest = loadTileJSON(tileJSON, map._requestManager, null, null, (err, result) => {
+
+        networkWorker.use(
+            http.get('/source.json', () => {
+                return HttpResponse.json(tileJSON);
+            }),
+        );
+
+        loadTileJSON(options, map._requestManager, null, null, withAsync((err, result, doneRef) => {
             expect(err).toEqual(null);
             expect(result.tiles).toEqual(["http://dataset2"]);
-        });
-        //  tiles should be replaced even when the above condition is met, and it happens in a different variant.
-        tileJSON = {
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
+
+    test('tiles should be replaced even when the above condition is met, and it happens in a different variant', async () => {
+        const {withAsync, wait} = doneAsync();
+        const options = {
+            url: "/source.json"
+        };
+
+        const tileJSON = {
             "tiles": ["http://dataset1"],
             "variants": [
                 {
@@ -73,12 +511,28 @@ describe('LoadTileJson#variants', () => {
                 }
             ]
         };
-        tileJSONRequest = loadTileJSON(tileJSON, map._requestManager, null, null, (err, result) => {
+
+        networkWorker.use(
+            http.get('/source.json', () => {
+                return HttpResponse.json(tileJSON);
+            }),
+        );
+
+        loadTileJSON(options, map._requestManager, null, null, withAsync((err, result, doneRef) => {
             expect(err).toEqual(null);
             expect(result.tiles).toEqual(["http://dataset3"]);
-        });
-        //  meshopt variants should replace other fields as well
-        tileJSON = {
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
+
+    test('meshopt variants should replace other fields as well', async () => {
+        const {withAsync, wait} = doneAsync();
+        const options = {
+            url: "/source.json"
+        };
+        const tileJSON = {
             "tiles": ["http://dataset1"],
             "minzoom": 1,
             "variants": [
@@ -93,9 +547,17 @@ describe('LoadTileJson#variants', () => {
                 }
             ]
         };
-        tileJSONRequest = loadTileJSON(tileJSON, map._requestManager, null, null, (err, result) => {
+        networkWorker.use(
+            http.get('/source.json', () => {
+                return HttpResponse.json(tileJSON);
+            }),
+        );
+        loadTileJSON(options, map._requestManager, null, null, withAsync((err, result, doneRef) => {
             expect(err).toEqual(null);
             expect(result.minzoom).toEqual(14);
-        });
-   });
+            doneRef.resolve();
+        }));
+
+        await wait;
+    });
 });
diff --git a/test/unit/source/source_cache.test.ts b/test/unit/source/source_cache.test.ts
index 5a47f54aded..18fdd66097c 100644
--- a/test/unit/source/source_cache.test.ts
+++ b/test/unit/source/source_cache.test.ts
@@ -1785,7 +1785,7 @@ describe('SourceCache loads tiles recursively', () => {
                     return;
                 }
 
-                if (e.tile) loadedTiles++;
+                if (e.tile && e.sourceDataType !== 'error') loadedTiles++;
                 if (loadedTiles === 4) setTimeout(() => assert(resolve), 0);
             });
 
@@ -1826,7 +1826,7 @@ describe('SourceCache loads tiles recursively', () => {
         }
     });
 
-    test('fires `data` event with `error` sourceDataType if all tiles are 404', async () => {
+    test('fires `data` event with `error` sourceDataType if all tile is 404', async () => {
         const transform = new Transform();
         transform.resize(511, 511);
         transform.zoom = 1;
@@ -1837,6 +1837,7 @@ describe('SourceCache loads tiles recursively', () => {
             }
         });
 
+        let loadedTiles = 0;
         await new Promise(resolve => {
             eventedParent.on('data', (e) => {
                 if (e.dataType === 'source' && e.sourceDataType === 'metadata') {
@@ -1844,19 +1845,18 @@ describe('SourceCache loads tiles recursively', () => {
                     return;
                 }
 
-                if (e.dataType === 'source' && e.sourceDataType === 'error') {
-                    expect(sourceCache.loaded()).toEqual(true);
-                    expect(sourceCache.getRenderableIds()).toStrictEqual([]);
-
-                    const tileStates = Object.values(sourceCache._tiles).map(t => t.state);
-                    expect(tileStates).toStrictEqual(Array(5).fill('errored'));
-
-                    resolve();
-                }
+                if (e.tile) loadedTiles++;
+                if (loadedTiles === 5) resolve(); // 4 tiles on zoom 1 and 1 parent tile on zoom 0
             });
 
             sourceCache.getSource().onAdd();
         });
+
+        expect(sourceCache.loaded()).toEqual(true);
+        expect(sourceCache.getRenderableIds()).toStrictEqual([]);
+
+        const tileStates = Object.values(sourceCache._tiles).map(t => t.state);
+        expect(tileStates).toStrictEqual(Array(5).fill('errored'));
     });
 });
 
diff --git a/test/unit/style-spec/expression.test.ts b/test/unit/style-spec/expression.test.ts
index d2a279dc58f..5000b621475 100644
--- a/test/unit/style-spec/expression.test.ts
+++ b/test/unit/style-spec/expression.test.ts
@@ -70,6 +70,6 @@ describe('evaluate expression', () => {
         expect(value.evaluate({}, {properties: {x: 'invalid'}})).toEqual('a');
         expect(
             console.warn
-        ).toHaveBeenCalledWith(`Expected value to be one of "a", "b", "c", but found "invalid" instead.`);
+        ).toHaveBeenCalledWith(`Failed to evaluate expression \"[\"string\",[\"get\",\"x\"]]\". Expected value to be one of \"a\", \"b\", \"c\", but found \"invalid\" instead.`);
     });
 });
diff --git a/test/unit/terrain/terrain.test.ts b/test/unit/terrain/terrain.test.ts
index 1e46765c6a2..2d791290aca 100644
--- a/test/unit/terrain/terrain.test.ts
+++ b/test/unit/terrain/terrain.test.ts
@@ -1782,3 +1782,92 @@ test('terrain recursively loads parent tiles on 404', async () => {
         new OverscaledTileID(14, 0, 14, 8191, 8191).key,
     ]);
 });
+
+describe('#hasCanvasFingerprintNoise', () => {
+    test('Dynamic terrain', async () => {
+        const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+        vi.spyOn(browser, 'hasCanvasFingerprintNoise').mockImplementation(() => true);
+
+        const style = createStyle();
+        const map = createMap({style, center: [0, 0], zoom: 16});
+        await waitFor(map, 'style.load');
+
+        map.addSource('mapbox-dem', {
+            type: 'raster-dem',
+            tiles: ['http://example.com/{z}/{x}/{y}.png'],
+            tileSize: TILE_SIZE,
+            maxzoom: 14
+        });
+
+        map.setTerrain({source: 'mapbox-dem'});
+
+        await waitFor(map, 'render');
+
+        expect(!!map.painter.terrain).toBeFalsy();
+    });
+
+    test('Terrain in Style', async () => {
+        const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+        vi.spyOn(browser, 'hasCanvasFingerprintNoise').mockImplementation(() => true);
+
+        const style = {
+            version: 8,
+            layers: [],
+            sources: {
+                'mapbox-dem': {
+                    type: 'raster-dem',
+                    tiles: ['http://example.com/{z}/{x}/{y}.png'],
+                    tileSize: TILE_SIZE,
+                    maxzoom: 14
+                }
+            },
+            terrain: {
+                source: 'mapbox-dem'
+            }
+        };
+
+        const map = createMap({style, center: [0, 0], zoom: 16});
+        await waitFor(map, 'style.load');
+
+        await waitFor(map, 'render');
+
+        expect(!!map.painter.terrain).toBeFalsy();
+    });
+
+    test('Terrain in Style fragment', async () => {
+        const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+        vi.spyOn(browser, 'hasCanvasFingerprintNoise').mockImplementation(() => true);
+
+        const style = {
+            version: 8,
+            layers: [],
+            sources: {},
+            imports: [{
+                id: 'basemap',
+                url: '',
+                data: {
+                    version: 8,
+                    layers: [],
+                    sources: {
+                        'mapbox-dem': {
+                            type: 'raster-dem',
+                            tiles: ['http://example.com/{z}/{x}/{y}.png'],
+                            tileSize: TILE_SIZE,
+                            maxzoom: 14
+                        }
+                    },
+                    terrain: {
+                        source: 'mapbox-dem'
+                    }
+                }
+            }]
+        };
+
+        const map = createMap({style, center: [0, 0], zoom: 16});
+        await waitFor(map, 'style.load');
+
+        await waitFor(map, 'render');
+
+        expect(!!map.painter.terrain).toBeFalsy();
+    });
+});
diff --git a/test/unit/util/tile_request_cache.test.ts b/test/unit/util/tile_request_cache.test.ts
index cde352281fd..0426c8882d3 100644
--- a/test/unit/util/tile_request_cache.test.ts
+++ b/test/unit/util/tile_request_cache.test.ts
@@ -54,7 +54,7 @@ describe('tile_request_cache', () => {
     });
 
     test('cacheGet, happy path', async () => {
-        const cachedRequest = new Request(`someurl?language=es&worldview=US&range=${encodeURIComponent('bytes=0-')}`);
+        const cachedRequest = new Request(`someurl?language=es&worldview=US&jobid=12345&range=${encodeURIComponent('bytes=0-')}`);
         const cachedResponse = {
             headers: {get: vi.fn().mockImplementation((name) => {
                 switch (name) {
@@ -78,9 +78,9 @@ describe('tile_request_cache', () => {
         window.caches.open = vi.fn().mockImplementation(() => Promise.resolve(fakeCache));
 
         await new Promise(resolve => {
-            // ensure that the language and worldview query parameters are retained,
+            // ensure that the language, worldview, and jobid query parameters are retained,
             // the Range header is added to the query string, but other query parameters are stripped
-            const request = new Request(`someurl?language=es&worldview=US&accessToken=foo`);
+            const request = new Request(`someurl?language=es&worldview=US&jobid=12345&accessToken=foo`);
             request.headers.set('Range', 'bytes=0-');
 
             cacheGet(request, (error, response, fresh) => {
diff --git a/test/util/vitest.ts b/test/util/vitest.ts
index 2f348b6d919..079a2cbdaf4 100644
--- a/test/util/vitest.ts
+++ b/test/util/vitest.ts
@@ -1,5 +1,5 @@
 // @ts-nocheck
-import {describe, test, expect, beforeEach, beforeAll, afterEach, afterAll, vi} from 'vitest';
+import {describe, test, expect, assert, beforeEach, beforeAll, afterEach, afterAll, vi} from 'vitest';
 import {Map} from '../../src/ui/map';
 import {extend} from '../../src/util/util';
 
@@ -87,4 +87,4 @@ export function equalWithPrecision(expected, actual, multiplier) {
     return expect(expectedRounded).toEqual(actualRounded);
 }
 
-export {describe, test, beforeEach, beforeAll, afterEach, afterAll, expect, vi};
+export {describe, test, beforeEach, beforeAll, afterEach, afterAll, expect, assert, vi};