diff --git a/@here/generator-harp.gl/package.json b/@here/generator-harp.gl/package.json
index b0ef592c65..cf5411bb4f 100644
--- a/@here/generator-harp.gl/package.json
+++ b/@here/generator-harp.gl/package.json
@@ -23,13 +23,14 @@
     ],
     "dependencies": {
         "mkdirp": "^1.0.4",
-        "yeoman-generator": "^4.10.1"
+        "yeoman-generator": "^5.2.0"
     },
     "devDependencies": {
         "chai": "^4.2.0",
         "fs.extra": "^1.3.2",
         "mocha": "^8.2.1",
-        "yeoman-test": "^2.6.0"
+        "yeoman-environment": "^3.4.1",
+        "yeoman-test": "^6.1.0"
     },
     "publishConfig": {
         "access": "public"
diff --git a/@here/generator-harp.gl/test/test.js b/@here/generator-harp.gl/test/test.js
index c5c3eef86e..9e9fb356eb 100644
--- a/@here/generator-harp.gl/test/test.js
+++ b/@here/generator-harp.gl/test/test.js
@@ -2,12 +2,8 @@ const fs = require("fs");
 const fsExtra = require("fs.extra");
 const path = require("path");
 const yeomanTestHelpers = require("yeoman-test");
-const {
-    assert
-} = require("chai");
-const {
-    spawnSync
-} = require('child_process');
+const { assert } = require("chai");
+const { spawnSync } = require("child_process");
 
 /*
 
@@ -17,13 +13,13 @@ const {
 
 */
 describe("harp.gl:app", function () {
-
     this.timeout(300000);
 
-    let helperDirectory;
+    let runContext;
 
     before(async function () {
-        helperDirectory = await yeomanTestHelpers.run(path.join(__dirname, '../generators/app'))
+        runContext = await yeomanTestHelpers
+            .run(path.join(__dirname, "../generators/app"))
             .inTmpDir(function (dir) {
                 if (process.env.USE_NPMRC) {
                     const targetPath = path.join(dir, ".npmrc");
@@ -31,29 +27,30 @@ describe("harp.gl:app", function () {
                 }
             })
             .withPrompts({
-                'access_token': 'test_token'
+                language: "typescript",
+                apikey: "test_token"
             });
 
-        assert.isString(helperDirectory);
+        assert.isNotNull(runContext);
     });
 
     it("webpack", async function () {
         const installStatus = spawnSync("npm", ["install"], {
-            cwd: helperDirectory
+            cwd: runContext.cwd
         });
         assert.strictEqual(installStatus.status, 0, installStatus.output);
 
         const buildStatus = spawnSync("npm", ["run", "build"], {
-            cwd: helperDirectory
+            cwd: runContext.cwd
         });
         assert.strictEqual(buildStatus.status, 0, buildStatus.output);
     });
 
     after(function () {
         if (process.env.KEEP_TEMP_DIR) {
-            console.log("Keeping", helperDirectory);
+            console.log("Keeping", runContext.cwd);
         } else {
-            fsExtra.rmrfSync(helperDirectory);
+            fsExtra.rmrfSync(runContext.cwd);
         }
     });
 });
diff --git a/@here/harp-datasource-protocol/lib/TechniqueParams.ts b/@here/harp-datasource-protocol/lib/TechniqueParams.ts
index b692dc3952..5c94cd6c28 100644
--- a/@here/harp-datasource-protocol/lib/TechniqueParams.ts
+++ b/@here/harp-datasource-protocol/lib/TechniqueParams.ts
@@ -480,7 +480,7 @@ export interface PointTechniqueParams extends BaseTechniqueParams {
     /**
      * Size of point in pixels.
      */
-    size?: number;
+    size?: DynamicProperty<number>;
     /**
      * Whether to enable picking on these points.
      */
diff --git a/@here/harp-datasource-protocol/package.json b/@here/harp-datasource-protocol/package.json
index 2b5dc43be1..5932fb963d 100644
--- a/@here/harp-datasource-protocol/package.json
+++ b/@here/harp-datasource-protocol/package.json
@@ -33,17 +33,17 @@
         "@here/harp-test-utils": "^0.25.0",
         "@types/chai": "^4.2.14",
         "@types/mocha": "^8.2.0",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "chai": "^4.0.2",
         "cross-env": "^7.0.2",
         "mocha": "^8.2.1",
         "source-map-support": "^0.5.19",
-        "three": "^0.127.0",
+        "three": "^0.129.0",
         "ts-json-schema-generator": "^0.68.1",
         "typescript": "^4.1.2"
     },
     "peerDependencies": {
-        "three": "^0.127.0"
+        "three": "^0.129.0"
     },
     "publishConfig": {
         "access": "public"
diff --git a/@here/harp-debug-datasource/package.json b/@here/harp-debug-datasource/package.json
index 5f76261091..e85e12e08b 100644
--- a/@here/harp-debug-datasource/package.json
+++ b/@here/harp-debug-datasource/package.json
@@ -31,7 +31,7 @@
         "@types/chai": "^4.2.14",
         "@types/mocha": "^8.2.0",
         "@types/node": "^14.0.5",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "chai": "^4.0.2",
         "cross-env": "^7.0.2",
         "mocha": "^8.2.1",
@@ -39,7 +39,7 @@
         "typescript": "^4.1.2"
     },
     "peerDependencies": {
-        "three": "^0.127.0"
+        "three": "^0.129.0"
     },
     "publishConfig": {
         "access": "public"
diff --git a/@here/harp-examples/index.html b/@here/harp-examples/index.html
index 3fa7bf94e7..bbfbc2829d 100644
--- a/@here/harp-examples/index.html
+++ b/@here/harp-examples/index.html
@@ -6,7 +6,7 @@
         <meta charset="utf-8" />
         <meta name="viewport"
             content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0" />
-        <link href="https://fonts.googleapis.com/css?family=Fira+Sans:400,500,600&amp;display=swap"
+        <link href="https://fonts.googleapis.com/css?family=Fira+Sans:normal,bold&amp;display=swap"
             rel="stylesheet">
         <style>
             :root {
diff --git a/@here/harp-examples/package.json b/@here/harp-examples/package.json
index cafd7d541f..aeee721706 100644
--- a/@here/harp-examples/package.json
+++ b/@here/harp-examples/package.json
@@ -43,7 +43,7 @@
         "@here/harp-webtile-datasource": "^0.25.0",
         "@types/dat.gui": "^0.7.1",
         "@types/long": "^4.0.1",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "copy-webpack-plugin": "^7.0.0",
         "cross-env": "^7.0.2",
         "css-loader": "^5.0.1",
@@ -54,7 +54,7 @@
         "stats.js": "^0.17.0",
         "style-loader": "^2.0.0",
         "suncalc": "^1.8.0",
-        "three": "^0.127.0",
+        "three": "^0.129.0",
         "ts-loader": "^8.0.7",
         "typescript": "^4.1.2",
         "webpack": "^5.12.3",
diff --git a/@here/harp-examples/src/datasource_geojson_choropleth.ts b/@here/harp-examples/src/datasource_geojson_choropleth.ts
index a0566cb1c0..8a44c8e220 100644
--- a/@here/harp-examples/src/datasource_geojson_choropleth.ts
+++ b/@here/harp-examples/src/datasource_geojson_choropleth.ts
@@ -168,7 +168,8 @@ export namespace GeoJsonHeatmapExample {
     );
     const geoJsonDataSource = new VectorTileDataSource({
         dataProvider: geoJsonDataProvider,
-        styleSetName: "geojson"
+        styleSetName: "geojson",
+        addGroundPlane: false
     });
     baseMap.addDataSource(geoJsonDataSource);
 
diff --git a/@here/harp-examples/src/datasource_geojson_custom-shader.ts b/@here/harp-examples/src/datasource_geojson_custom-shader.ts
index bab768ce43..6ae777b73f 100644
--- a/@here/harp-examples/src/datasource_geojson_custom-shader.ts
+++ b/@here/harp-examples/src/datasource_geojson_custom-shader.ts
@@ -128,7 +128,8 @@ export namespace GeoJsonCustomShaderExample {
         private addEvRange() {
             const datasource = new VectorTileDataSource({
                 dataProvider: new GeoJsonDataProvider("geojson", geojson as any),
-                styleSetName: "geojson"
+                styleSetName: "geojson",
+                addGroundPlane: false
             });
             this.mapView.addDataSource(datasource);
         }
diff --git a/@here/harp-examples/src/datasource_geojson_elevated-markers.ts b/@here/harp-examples/src/datasource_geojson_elevated-markers.ts
index 1222ee8f51..ec8bf0fd01 100644
--- a/@here/harp-examples/src/datasource_geojson_elevated-markers.ts
+++ b/@here/harp-examples/src/datasource_geojson_elevated-markers.ts
@@ -106,7 +106,8 @@ export namespace ElevatedGeoJsonMarkersExample {
             new VectorTileDataSource({
                 dataProvider: new CustomGeoJsonDataProvider(),
                 name: "geojson",
-                styleSetName: "geojson"
+                styleSetName: "geojson",
+                addGroundPlane: false
             })
         );
 
diff --git a/@here/harp-examples/src/datasource_geojson_points.ts b/@here/harp-examples/src/datasource_geojson_points.ts
index 57b0e6c7f4..0e561a20b8 100644
--- a/@here/harp-examples/src/datasource_geojson_points.ts
+++ b/@here/harp-examples/src/datasource_geojson_points.ts
@@ -113,7 +113,8 @@ export namespace TiledGeoJsonPointExample {
         const geoJsonDataSource = new VectorTileDataSource({
             dataProvider: geoJsonDataProvider,
             name: "geojson",
-            styleSetName: "geojson"
+            styleSetName: "geojson",
+            addGroundPlane: false
         });
         map.addDataSource(geoJsonDataSource);
 
diff --git a/@here/harp-examples/src/datasource_geojson_styling_game.ts b/@here/harp-examples/src/datasource_geojson_styling_game.ts
index f7874e4260..ac11a63ad3 100644
--- a/@here/harp-examples/src/datasource_geojson_styling_game.ts
+++ b/@here/harp-examples/src/datasource_geojson_styling_game.ts
@@ -119,7 +119,8 @@ export namespace GeoJsonStylingGame {
             dataProvider: geoJsonDataProvider,
             name: "geojson",
             styleSetName: "geojson",
-            gatherFeatureAttributes: true
+            gatherFeatureAttributes: true,
+            addGroundPlane: false
         });
 
         await mapView.addDataSource(geoJsonDataSource);
diff --git a/@here/harp-examples/src/geojson-viewer.ts b/@here/harp-examples/src/geojson-viewer.ts
index 49203b88c9..dd2817437d 100644
--- a/@here/harp-examples/src/geojson-viewer.ts
+++ b/@here/harp-examples/src/geojson-viewer.ts
@@ -181,7 +181,7 @@ export namespace GeoJsonExample {
 
     function getExampleHTML(): string {
         return `
-            <link href="https://fonts.googleapis.com/css?family=Fira+Sans:400,500,600&amp;display=swap" rel="stylesheet">
+            <link href="https://fonts.googleapis.com/css?family=Fira+Sans&amp;display=swap" rel="stylesheet">
             <style>
                 :root{
                     --editor-width:${editorWidth};
diff --git a/@here/harp-examples/src/real-time-shadows.ts b/@here/harp-examples/src/real-time-shadows.ts
index 6603d07517..26a14cc094 100644
--- a/@here/harp-examples/src/real-time-shadows.ts
+++ b/@here/harp-examples/src/real-time-shadows.ts
@@ -47,7 +47,8 @@ const guiOptions = {
     time: date.getHours() + date.getMinutes() / 60,
     timeIndicator: `${date.getHours()}:${date.getMinutes()}`,
     debugCamera: false,
-    enableRasterTiles: false
+    enableRasterTiles: false,
+    textureSquareSize: 1024
 };
 // Reference solar noon time is used to calculate time offsets at specific coordinates.
 const refSolarNoon = SunCalc.getTimes(date, 0, 0).solarNoon;
@@ -297,6 +298,13 @@ function addGuiElements() {
             map.addDataSource(hereWebTileDataSource);
         }
     });
+    gui.add(guiOptions, "textureSquareSize", 256, 4096, 32).onChange(size => {
+        (sun.shadow.map as any).dispose();
+        (sun.shadow as any).map = null;
+        sun.shadow.mapSize.width = size;
+        sun.shadow.mapSize.height = size;
+        map.update();
+    });
 }
 
 export namespace RealTimeShadows {
diff --git a/@here/harp-examples/template/example.html b/@here/harp-examples/template/example.html
index 7bc647b34b..e94d6c6d03 100644
--- a/@here/harp-examples/template/example.html
+++ b/@here/harp-examples/template/example.html
@@ -9,7 +9,7 @@
         <meta http-equiv="X-UA-Compatible" content="ie=edge" />
         <title><%= htmlWebpackPlugin.options.title %></title>
         <link
-            href="https://fonts.googleapis.com/css?family=Fira+Sans:400,500,600&amp;display=swap"
+            href="https://fonts.googleapis.com/css?family=Fira+Sans:normal,bold&amp;display=swap"
             rel="stylesheet"
         />
         <style>
diff --git a/@here/harp-features-datasource/lib/FeaturesDataSource.ts b/@here/harp-features-datasource/lib/FeaturesDataSource.ts
index fffc21da2d..932ecda9ff 100644
--- a/@here/harp-features-datasource/lib/FeaturesDataSource.ts
+++ b/@here/harp-features-datasource/lib/FeaturesDataSource.ts
@@ -66,7 +66,8 @@ export class FeaturesDataSource extends VectorTileDataSource {
     constructor(options?: FeatureDataSourceOptions) {
         super({
             ...options,
-            dataProvider: new GeoJsonDataProvider(NAME, DEFAULT_GEOJSON, options)
+            dataProvider: new GeoJsonDataProvider(NAME, DEFAULT_GEOJSON, options),
+            addGroundPlane: false
         });
         if (options !== undefined) {
             if (options.features !== undefined) {
diff --git a/@here/harp-features-datasource/package.json b/@here/harp-features-datasource/package.json
index f33502a838..d3d645a986 100644
--- a/@here/harp-features-datasource/package.json
+++ b/@here/harp-features-datasource/package.json
@@ -29,7 +29,7 @@
         "@types/chai": "^4.2.14",
         "@types/mocha": "^8.2.0",
         "@types/node": "^14.0.5",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "chai": "^4.0.2",
         "cross-env": "^7.0.2",
         "mocha": "^8.2.1",
@@ -38,7 +38,7 @@
         "typescript": "^4.1.2"
     },
     "peerDependencies": {
-        "three": "^0.127.0"
+        "three": "^0.129.0"
     },
     "publishConfig": {
         "access": "public"
diff --git a/@here/harp-geojson-datasource/package.json b/@here/harp-geojson-datasource/package.json
index b55bfa360f..bb79b3c1e5 100644
--- a/@here/harp-geojson-datasource/package.json
+++ b/@here/harp-geojson-datasource/package.json
@@ -32,13 +32,13 @@
         "@types/chai": "^4.2.14",
         "@types/mocha": "^8.2.0",
         "@types/node": "^14.0.5",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "chai": "^4.0.2",
         "cross-env": "^7.0.2",
         "mocha": "^8.2.1",
         "sinon": "^9.2.2",
         "source-map-support": "^0.5.19",
-        "three": "^0.127.0",
+        "three": "^0.129.0",
         "typescript": "^4.1.2"
     },
     "publishConfig": {
diff --git a/@here/harp-geometry/package.json b/@here/harp-geometry/package.json
index fce4a40c38..1e9efed145 100644
--- a/@here/harp-geometry/package.json
+++ b/@here/harp-geometry/package.json
@@ -28,18 +28,18 @@
         "@types/mocha": "^8.2.0",
         "@types/node": "^14.0.5",
         "@types/sinon": "^9.0.10",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "chai": "^4.0.2",
         "cross-env": "^7.0.2",
         "earcut": "^2.2.2",
         "mocha": "^8.2.1",
         "sinon": "^9.2.2",
         "source-map-support": "^0.5.19",
-        "three": "^0.127.0",
+        "three": "^0.129.0",
         "typescript": "^4.1.2"
     },
     "peerDependencies": {
-        "three": "^0.127.0"
+        "three": "^0.129.0"
     },
     "dependencies": {
         "@here/harp-geoutils": "^0.25.0",
diff --git a/@here/harp-geoutils/package.json b/@here/harp-geoutils/package.json
index 6418e9fab2..2ddd56ea0d 100644
--- a/@here/harp-geoutils/package.json
+++ b/@here/harp-geoutils/package.json
@@ -23,17 +23,17 @@
         "@types/chai": "^4.2.14",
         "@types/mocha": "^8.2.0",
         "@types/sinon": "^9.0.10",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "chai": "^4.0.2",
         "cross-env": "^7.0.2",
         "mocha": "^8.2.1",
         "sinon": "^9.2.2",
         "source-map-support": "^0.5.19",
-        "three": "^0.127.0",
+        "three": "^0.129.0",
         "typescript": "^4.1.2"
     },
     "peerDependencies": {
-        "three": "^0.127.0"
+        "three": "^0.129.0"
     },
     "publishConfig": {
         "access": "public"
diff --git a/@here/harp-lines/package.json b/@here/harp-lines/package.json
index a292bf8483..26ac61d692 100644
--- a/@here/harp-lines/package.json
+++ b/@here/harp-lines/package.json
@@ -32,16 +32,16 @@
         "@here/harp-utils": "^0.25.0",
         "@types/chai": "^4.2.14",
         "@types/mocha": "^8.2.0",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "chai": "^4.0.2",
         "cross-env": "^7.0.2",
         "mocha": "^8.2.1",
         "source-map-support": "^0.5.19",
-        "three": "^0.127.0",
+        "three": "^0.129.0",
         "typescript": "^4.1.2"
     },
     "peerDependencies": {
-        "three": "^0.127.0"
+        "three": "^0.129.0"
     },
     "publishConfig": {
         "access": "public"
diff --git a/@here/harp-map-controls/package.json b/@here/harp-map-controls/package.json
index 2142cd6634..6181eff534 100644
--- a/@here/harp-map-controls/package.json
+++ b/@here/harp-map-controls/package.json
@@ -33,17 +33,17 @@
         "@types/mocha": "^8.2.0",
         "@types/node": "^14.0.5",
         "@types/sinon": "^9.0.10",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "chai": "^4.0.2",
         "cross-env": "^7.0.2",
         "mocha": "^8.2.1",
         "sinon": "^9.2.2",
         "source-map-support": "^0.5.19",
-        "three": "^0.127.0",
+        "three": "^0.129.0",
         "typescript": "^4.1.2"
     },
     "peerDependencies": {
-        "three": "^0.127.0"
+        "three": "^0.129.0"
     },
     "publishConfig": {
         "access": "public"
diff --git a/@here/harp-mapview-decoder/lib/ThemedTileDecoder.ts b/@here/harp-mapview-decoder/lib/ThemedTileDecoder.ts
index 54047c945e..e3cfa03408 100644
--- a/@here/harp-mapview-decoder/lib/ThemedTileDecoder.ts
+++ b/@here/harp-mapview-decoder/lib/ThemedTileDecoder.ts
@@ -35,7 +35,7 @@ export abstract class ThemedTileDecoder implements ITileDecoder {
     }
 
     decodeTile(
-        data: ArrayBufferLike,
+        data: ArrayBufferLike | {},
         tileKey: TileKey,
         projection: Projection
     ): Promise<DecodedTile | undefined> {
diff --git a/@here/harp-mapview-decoder/test/TileGeometryLoaderTest.ts b/@here/harp-mapview-decoder/test/TileGeometryLoaderTest.ts
index 2b3019aacd..519e647120 100644
--- a/@here/harp-mapview-decoder/test/TileGeometryLoaderTest.ts
+++ b/@here/harp-mapview-decoder/test/TileGeometryLoaderTest.ts
@@ -99,7 +99,6 @@ describe("TileGeometryLoader", function () {
     let dataSource: DataSource;
     let mapView: MapView;
     let geometryLoader: TileGeometryLoader;
-    let sandbox: any;
 
     before(function () {
         tileKey = TileKey.fromRowColumnLevel(0, 0, 0);
@@ -112,11 +111,10 @@ describe("TileGeometryLoader", function () {
         dataSource.attach(mapView);
         tile = dataSource.getTile(tileKey)!;
         geometryLoader = (tile as any).m_tileGeometryLoader!;
-        sandbox = sinon.createSandbox();
     });
 
     afterEach(function () {
-        sandbox.restore();
+        sinon.restore();
     });
 
     describe("tile preprocessing", function () {
@@ -157,8 +155,8 @@ describe("TileGeometryLoader", function () {
             tile.decodedTile = createFakeDecodedTile();
 
             const geometryCreator = TileGeometryCreator.instance;
-            const spyProcessTechniques = sandbox.spy(geometryCreator, "processTechniques") as any;
-            const spySetDecodedTile = sandbox.spy(geometryLoader, "setDecodedTile") as any;
+            const spyProcessTechniques = sinon.spy(geometryCreator, "processTechniques") as any;
+            const spySetDecodedTile = sinon.spy(geometryLoader, "setDecodedTile") as any;
             expect(spyProcessTechniques.callCount).equal(0);
             expect(spySetDecodedTile.callCount).equal(0);
 
@@ -181,12 +179,33 @@ describe("TileGeometryLoader", function () {
             expect(geometryLoader.isFinished).to.be.true;
         });
 
+        it("should wait until all textures are ready to render", async function () {
+            tile.decodedTile = createFakeDecodedTile();
+
+            const geometryCreator = TileGeometryCreator.instance;
+            let makeTexturesReady: () => void | undefined;
+            const texturesPromise = new Promise<void>(resolve => {
+                makeTexturesReady = resolve;
+            });
+            sinon.stub(geometryCreator, "createAllGeometries").returns(texturesPromise);
+            geometryLoader!.update();
+            expect(mapView.taskQueue.numItemsLeft(TileTaskGroups.CREATE)).equal(1);
+            expect(mapView.taskQueue.processNext(TileTaskGroups.CREATE)).equal(true);
+
+            await wait();
+            expect(geometryLoader.isFinished).to.be.false;
+
+            makeTexturesReady!();
+            await expect(texturesPromise).to.eventually.be.fulfilled;
+            expect(geometryLoader.isFinished).to.be.true;
+        });
+
         it("should create geometry for decoded tile only once (via taskqueue)", async function () {
             tile.decodedTile = createFakeDecodedTile();
 
             const geometryCreator = TileGeometryCreator.instance;
-            const spyProcessTechniques = sandbox.spy(geometryCreator, "processTechniques") as any;
-            const spyCreateGeometries = sandbox.spy(geometryCreator, "createAllGeometries") as any;
+            const spyProcessTechniques = sinon.spy(geometryCreator, "processTechniques") as any;
+            const spyCreateGeometries = sinon.spy(geometryCreator, "createAllGeometries") as any;
             expect(spyCreateGeometries.callCount).equal(0);
             expect(spyProcessTechniques.callCount).equal(0);
 
@@ -212,8 +231,8 @@ describe("TileGeometryLoader", function () {
             tile.decodedTile = createFakeDecodedTile();
 
             const geometryCreator = TileGeometryCreator.instance;
-            const spyProcessTechniques = sandbox.spy(geometryCreator, "processTechniques") as any;
-            const spyCreateGeometries = sandbox.spy(geometryCreator, "createAllGeometries") as any;
+            const spyProcessTechniques = sinon.spy(geometryCreator, "processTechniques") as any;
+            const spyCreateGeometries = sinon.spy(geometryCreator, "createAllGeometries") as any;
             expect(spyCreateGeometries.callCount).equal(0);
             expect(spyProcessTechniques.callCount).equal(0);
 
@@ -234,8 +253,8 @@ describe("TileGeometryLoader", function () {
             tile.decodedTile = createFakeDecodedTile();
 
             const geometryCreator = TileGeometryCreator.instance;
-            const spyProcessTechniques = sandbox.spy(geometryCreator, "processTechniques") as any;
-            const spyCreateGeometries = sandbox.spy(geometryCreator, "createAllGeometries") as any;
+            const spyProcessTechniques = sinon.spy(geometryCreator, "processTechniques") as any;
+            const spyCreateGeometries = sinon.spy(geometryCreator, "createAllGeometries") as any;
             expect(spyCreateGeometries.callCount).equal(0);
             expect(spyProcessTechniques.callCount).equal(0);
 
@@ -257,8 +276,8 @@ describe("TileGeometryLoader", function () {
             tile.decodedTile = createFakeDecodedTile();
 
             const geometryCreator = TileGeometryCreator.instance;
-            const spyProcessTechniques = sandbox.spy(geometryCreator, "processTechniques") as any;
-            const spyCreateGeometries = sandbox.spy(geometryCreator, "createAllGeometries") as any;
+            const spyProcessTechniques = sinon.spy(geometryCreator, "processTechniques") as any;
+            const spyCreateGeometries = sinon.spy(geometryCreator, "createAllGeometries") as any;
             expect(spyCreateGeometries.callCount).equal(0);
             expect(spyProcessTechniques.callCount).equal(0);
 
@@ -295,8 +314,8 @@ describe("TileGeometryLoader", function () {
             tile.decodedTile = createFakeDecodedTile();
 
             const geometryCreator = TileGeometryCreator.instance;
-            const spyProcessTechniques = sandbox.spy(geometryCreator, "processTechniques") as any;
-            const spyCreateGeometries = sandbox.spy(geometryCreator, "createAllGeometries") as any;
+            const spyProcessTechniques = sinon.spy(geometryCreator, "processTechniques") as any;
+            const spyCreateGeometries = sinon.spy(geometryCreator, "createAllGeometries") as any;
             expect(spyCreateGeometries.callCount).equal(0);
             expect(spyProcessTechniques.callCount).equal(0);
 
@@ -331,8 +350,8 @@ describe("TileGeometryLoader", function () {
             tile.decodedTile = createFakeDecodedTile();
 
             const geometryCreator = TileGeometryCreator.instance;
-            const spyProcessTechniques = sandbox.spy(geometryCreator, "processTechniques") as any;
-            const spyCreateGeometries = sandbox.spy(geometryCreator, "createAllGeometries") as any;
+            const spyProcessTechniques = sinon.spy(geometryCreator, "processTechniques") as any;
+            const spyCreateGeometries = sinon.spy(geometryCreator, "createAllGeometries") as any;
             expect(spyCreateGeometries.callCount).equal(0);
             expect(spyProcessTechniques.callCount).equal(0);
 
diff --git a/@here/harp-mapview/lib/ClipPlanesEvaluator.ts b/@here/harp-mapview/lib/ClipPlanesEvaluator.ts
index 0388de0e01..2e967cfaeb 100644
--- a/@here/harp-mapview/lib/ClipPlanesEvaluator.ts
+++ b/@here/harp-mapview/lib/ClipPlanesEvaluator.ts
@@ -49,110 +49,6 @@ export interface ClipPlanesEvaluator {
     ): ViewRanges;
 }
 
-/**
- * Simplest camera clip planes evaluator, interpolates near/far planes based on ground distance.
- *
- * @remarks
- * At general ground distance to camera along the surface normal is used as reference point for
- * planes evaluation, where near plane distance is set as fraction of this distance refereed as
- * [[nearMultiplier]]. Far plane equation has its own multiplier - [[nearFarMultiplier]],
- * which is applied to near plane and offset giving finally far plane distance.
- * This evaluator supports both planar and spherical projections, although it's behavior is
- * slightly different in each case. General algorithm sets near plane between camera and
- * ground level, while far plane is just calculated using scale and bias approach with far offset
- * and multiplier.
- * @deprecated Class contains the legacy (first and original) clip planes evaluation method, which
- * is widely used in examples thus is still kept for backward compatibility and comparisons.
- */
-export class InterpolatedClipPlanesEvaluator implements ClipPlanesEvaluator {
-    readonly farMin: number;
-
-    protected m_tmpVectors: THREE.Vector3[] = [
-        new THREE.Vector3(),
-        new THREE.Vector3(),
-        new THREE.Vector3()
-    ];
-
-    protected m_tmpQuaternion: THREE.Quaternion = new THREE.Quaternion();
-
-    constructor(
-        readonly nearMin: number = 0.1,
-        readonly nearMultiplier: number = 0.1,
-        readonly nearFarMultiplier = 50.0,
-        readonly farOffset = 200.0
-    ) {
-        assert(nearMin > 0);
-        assert(nearFarMultiplier >= 0);
-        assert(farOffset >= 0);
-        this.farMin = nearMin * nearFarMultiplier + farOffset;
-    }
-
-    set minElevation(elevation: number) {}
-
-    get minElevation(): number {
-        // This evaluator does not support elevation so its always set to 0.
-        return 0;
-    }
-
-    set maxElevation(elevation: number) {}
-
-    get maxElevation(): number {
-        // This evaluator does not support elevation so its always set to 0.
-        return 0;
-    }
-
-    evaluateClipPlanes(
-        camera: THREE.Camera,
-        projection: Projection,
-        elevationProvider?: ElevationProvider
-    ): ViewRanges {
-        let nearPlane: number = this.nearMin;
-        let farPlane: number = this.farMin;
-        if (projection.type === ProjectionType.Spherical) {
-            // near and far plane for a set up where
-            // the camera is looking at the center of the scene.
-            const r = EarthConstants.EQUATORIAL_RADIUS;
-            const d = camera.position.length();
-            const alpha = Math.asin(r / d);
-            // Extract X, Y, Z axes into tmp vectors array.
-            camera.matrixWorld.extractBasis(
-                this.m_tmpVectors[0],
-                this.m_tmpVectors[1],
-                this.m_tmpVectors[2]
-            );
-            // Setup quaternion based on X axis.
-            this.m_tmpQuaternion.setFromAxisAngle(this.m_tmpVectors[0], alpha);
-            // Acquire forward vector based on Z axis reversed (keep it in tmpVectors[2]).
-            const fwd = this.m_tmpVectors[2].negate();
-            // Apply quaternion rotation to forward vector, store it in tmpVectors[1].
-            const fwdRot = this.m_tmpVectors[1].copy(fwd).applyQuaternion(this.m_tmpQuaternion);
-            // Store camera position tmpVectors[0] and reference it with p.
-            const p = this.m_tmpVectors[0].copy(camera.position);
-            p.addScaledVector(fwdRot, Math.sqrt(d * d - r * r));
-            farPlane = p.sub(camera.position).dot(fwd) + this.farOffset;
-            nearPlane = Math.max(
-                this.nearMin,
-                projection.groundDistance(camera.position) * this.nearMultiplier
-            );
-        } else if (projection.type === ProjectionType.Planar) {
-            const groundDistance = projection.groundDistance(camera.position);
-            nearPlane = Math.max(this.nearMin, groundDistance * this.nearMultiplier);
-            // Will be already clamped to minFar due to clamping above.
-            farPlane = nearPlane * this.nearFarMultiplier + this.farOffset;
-        } else {
-            assert(false, "Unsupported projection type");
-        }
-
-        const viewRanges: ViewRanges = {
-            near: nearPlane,
-            far: farPlane,
-            minimum: this.nearMin,
-            maximum: farPlane
-        };
-        return viewRanges;
-    }
-}
-
 /**
  * Abstract evaluator class that adds support for elevation constraints.
  *
@@ -237,6 +133,8 @@ export abstract class ElevationBasedClipPlanesEvaluator implements ClipPlanesEva
 /**
  * Top view, clip planes evaluator that computes view ranges based on ground distance and elevation.
  *
+ * @deprecated Default evaluator {@link TiltViewClipPlanesEvaluator} supports top-down views.
+ *
  * @remarks
  * This evaluator supports both planar and spherical projections, although it behavior is
  * slightly different in each case. General algorithm sets near plane and far plane close
diff --git a/@here/harp-mapview/lib/DecodedTileHelpers.ts b/@here/harp-mapview/lib/DecodedTileHelpers.ts
index bcb7bf102e..ea1a84fef7 100644
--- a/@here/harp-mapview/lib/DecodedTileHelpers.ts
+++ b/@here/harp-mapview/lib/DecodedTileHelpers.ts
@@ -112,7 +112,7 @@ function createTextureFromRawImage(
     onError: (error: ErrorEvent | string) => void
 ) {
     const properties = textureBuffer.dataTextureProperties;
-    if (properties !== undefined) {
+    if (properties) {
         const textureDataType: THREE.TextureDataType | undefined = properties.type
             ? toTextureDataType(properties.type)
             : undefined;
@@ -131,84 +131,88 @@ function createTextureFromRawImage(
     }
 }
 
+function initTextureProperties(texture: THREE.Texture, properties?: TextureProperties) {
+    if (!properties) {
+        return;
+    }
+    if (properties.wrapS !== undefined) {
+        texture.wrapS = toWrappingMode(properties.wrapS);
+    }
+    if (properties.wrapT !== undefined) {
+        texture.wrapT = toWrappingMode(properties.wrapT);
+    }
+    if (properties.magFilter !== undefined) {
+        texture.magFilter = toTextureFilter(properties.magFilter);
+    }
+    if (properties.minFilter !== undefined) {
+        texture.minFilter = toTextureFilter(properties.minFilter);
+    }
+    if (properties.flipY !== undefined) {
+        texture.flipY = properties.flipY;
+    }
+    if (properties.repeatU !== undefined) {
+        texture.repeat.x = properties.repeatU;
+    }
+    if (properties.repeatV !== undefined) {
+        texture.repeat.y = properties.repeatV;
+    }
+}
+
 function createTexture(
     material: THREE.Material,
     texturePropertyName: string,
-    options: MaterialOptions,
-    textureReadyCallback?: (texture: THREE.Texture) => void
-) {
+    options: MaterialOptions
+): Promise<THREE.Texture> | undefined {
     const technique = options.technique;
     let textureProperty = (technique as any)[texturePropertyName];
     if (textureProperty === undefined) {
-        return;
+        return undefined;
     }
 
-    const onLoad = (texture: THREE.Texture) => {
-        const properties = (technique as any)[
-            texturePropertyName + "Properties"
-        ] as TextureProperties;
-        if (properties !== undefined) {
-            if (properties.wrapS !== undefined) {
-                texture.wrapS = toWrappingMode(properties.wrapS);
-            }
-            if (properties.wrapT !== undefined) {
-                texture.wrapT = toWrappingMode(properties.wrapT);
-            }
-            if (properties.magFilter !== undefined) {
-                texture.magFilter = toTextureFilter(properties.magFilter);
-            }
-            if (properties.minFilter !== undefined) {
-                texture.minFilter = toTextureFilter(properties.minFilter);
-            }
-            if (properties.flipY !== undefined) {
-                texture.flipY = properties.flipY;
-            }
-            if (properties.repeatU !== undefined) {
-                texture.repeat.x = properties.repeatU;
-            }
-            if (properties.repeatV !== undefined) {
-                texture.repeat.y = properties.repeatV;
-            }
-        }
-        (material as any)[texturePropertyName] = texture;
-        material.needsUpdate = true;
+    const texturePromise = new Promise<THREE.Texture>((resolve, reject) => {
+        const onLoad = (texture: THREE.Texture) => {
+            const properties: TextureProperties | undefined = (technique as any)[
+                texturePropertyName + "Properties"
+            ];
+            initTextureProperties(texture, properties);
+            (material as any)[texturePropertyName] = texture;
+            material.needsUpdate = true;
+            resolve(texture);
+        };
+        const onError = (error: ErrorEvent | string) => {
+            logger.error("#createMaterial: Failed to load texture: ", error);
+            reject(error);
+        };
 
-        if (textureReadyCallback) {
-            textureReadyCallback(texture);
-        }
-    };
-
-    const onError = (error: ErrorEvent | string) => {
-        logger.error("#createMaterial: Failed to load texture: ", error);
-    };
-
-    if (Expr.isExpr(textureProperty)) {
-        textureProperty = getPropertyValue(textureProperty, options.env);
-        if (!textureProperty) {
-            // Expression may evaluate to a valid texture at any time, create a fake texture to
-            // avoid shader recompilation.
-            onLoad(new THREE.Texture());
-            return;
+        if (Expr.isExpr(textureProperty)) {
+            textureProperty = getPropertyValue(textureProperty, options.env);
+            if (!textureProperty) {
+                // Expression may evaluate to a valid texture at any time, create a fake texture to
+                // avoid shader recompilation.
+                onLoad(new THREE.Texture());
+                return;
+            }
         }
-    }
 
-    if (typeof textureProperty === "string") {
-        createTextureFromURL(textureProperty, onLoad, onError, false);
-    } else if (isTextureBuffer(textureProperty)) {
-        if (textureProperty.type === "image/raw") {
-            createTextureFromRawImage(textureProperty, onLoad, onError);
-        } else {
-            const textureBlob = new Blob([textureProperty.buffer], {
-                type: textureProperty.type
-            });
-            createTextureFromURL(URL.createObjectURL(textureBlob), onLoad, onError, true);
+        if (typeof textureProperty === "string") {
+            createTextureFromURL(textureProperty, onLoad, onError, false);
+        } else if (isTextureBuffer(textureProperty)) {
+            if (textureProperty.type === "image/raw") {
+                createTextureFromRawImage(textureProperty, onLoad, onError);
+            } else {
+                const textureBlob = new Blob([textureProperty.buffer], {
+                    type: textureProperty.type
+                });
+                createTextureFromURL(URL.createObjectURL(textureBlob), onLoad, onError, true);
+            }
+        } else if (
+            typeof textureProperty === "object" &&
+            (textureProperty.nodeName === "IMG" || textureProperty.nodeName === "CANVAS")
+        ) {
+            onLoad(new THREE.CanvasTexture(textureProperty));
         }
-    } else if (
-        typeof textureProperty === "object" &&
-        (textureProperty.nodeName === "IMG" || textureProperty.nodeName === "CANVAS")
-    ) {
-        onLoad(new THREE.CanvasTexture(textureProperty));
-    }
+    });
+    return texturePromise;
 }
 
 /**
@@ -216,17 +220,17 @@ function createTexture(
  *
  * @param rendererCapabilities - The capabilities of the renderer that will use the material.
  * @param options - The material options the subsequent functions need.
- * @param materialUpdateCallback - Optional callback when the material gets updated,
- *                               e.g. after texture loading.
+ * @param onTextureCreated - Optional callback for each texture created for the material, getting
+ * a promise that will be resolved once the texture is loaded. Texture is not uploaded to GPU.
  *
- * @returns new material instance that matches `technique.name`
+ * @returns new material instance that matches `technique.name`.
  *
  * @internal
  */
 export function createMaterial(
     rendererCapabilities: THREE.WebGLCapabilities,
     options: MaterialOptions,
-    textureReadyCallback?: (texture: THREE.Texture) => void
+    onTextureCreated?: (texture: Promise<THREE.Texture>) => void
 ): THREE.Material | undefined {
     const technique = options.technique;
     const Constructor = getMaterialConstructor(technique, options.shadowsEnabled === true);
@@ -260,9 +264,12 @@ export function createMaterial(
     material.depthTest = isExtrudedPolygonTechnique(technique) && technique.depthTest !== false;
 
     if (supportsTextures(technique)) {
-        TEXTURE_PROPERTY_KEYS.forEach((texturePropertyName: string) =>
-            createTexture(material, texturePropertyName, options, textureReadyCallback)
-        );
+        TEXTURE_PROPERTY_KEYS.forEach((texturePropertyName: string) => {
+            const texturePromise = createTexture(material, texturePropertyName, options);
+            if (texturePromise) {
+                onTextureCreated?.(texturePromise);
+            }
+        });
     }
 
     if (isShaderTechnique(technique)) {
diff --git a/@here/harp-mapview/lib/MapMaterialAdapter.ts b/@here/harp-mapview/lib/MapMaterialAdapter.ts
index 8e2e55f1d7..e2f0ecfbe9 100644
--- a/@here/harp-mapview/lib/MapMaterialAdapter.ts
+++ b/@here/harp-mapview/lib/MapMaterialAdapter.ts
@@ -109,6 +109,7 @@ export class MapMaterialAdapter {
 
     private m_lastUpdateFrameNumber = -1;
     private readonly m_dynamicProperties: Array<[string, Expr | StylePropertyEvaluator]>;
+    private readonly tmpColor = new THREE.Color();
 
     constructor(material: THREE.Material, styledProperties: StyledProperties) {
         this.material = material;
@@ -279,10 +280,13 @@ export class MapMaterialAdapter {
                 colorValue = parsed;
             }
             const rgbValue = ColorUtils.removeAlphaFromHex(colorValue);
-            m[propName].set(rgbValue);
-        } else {
-            m[propName] = value;
+            this.tmpColor.set(rgbValue);
+            // We set the value, i.e. using =, as opposed to setting the color directly using set
+            // because the material may be a custom material with a setter.
+            value = this.tmpColor;
         }
+
+        m[propName] = value;
     }
 
     private applyMaterialBaseColor(color: Value, opacity: number | undefined) {
diff --git a/@here/harp-mapview/lib/MapView.ts b/@here/harp-mapview/lib/MapView.ts
index 0b8b66f08a..66c863a5af 100644
--- a/@here/harp-mapview/lib/MapView.ts
+++ b/@here/harp-mapview/lib/MapView.ts
@@ -43,6 +43,7 @@ import {
 import * as THREE from "three";
 
 import { AnimatedExtrusionHandler } from "./AnimatedExtrusionHandler";
+import { BackgroundDataSource } from "./BackgroundDataSource";
 import { CameraMovementDetector } from "./CameraMovementDetector";
 import { ClipPlanesEvaluator, createDefaultClipPlanesEvaluator } from "./ClipPlanesEvaluator";
 import { IMapAntialiasSettings, IMapRenderingManager, MapRenderingManager } from "./composing";
@@ -2118,6 +2119,15 @@ export class MapView extends EventDispatcher {
 
         dataSource.attach(this);
         dataSource.setEnableElevationOverlay(this.m_elevationProvider !== undefined);
+        const conflictingDataSource = this.m_tileDataSources.find(
+            ds => ds.addGroundPlane === true && !(ds instanceof BackgroundDataSource)
+        );
+        if (dataSource.addGroundPlane === true && conflictingDataSource !== undefined) {
+            // eslint-disable-next-line no-console
+            console.warn(
+                `The DataSources ${dataSource.name} and ${conflictingDataSource.name} both have a ground plane added, this will cause problems with the fallback logic, see HARP-14728 & HARP-15488.`
+            );
+        }
         this.m_tileDataSources.push(dataSource);
         this.m_sceneEnvironment?.updateBackgroundDataSource();
 
diff --git a/@here/harp-mapview/lib/PickHandler.ts b/@here/harp-mapview/lib/PickHandler.ts
index b0ce259451..515b16b49e 100644
--- a/@here/harp-mapview/lib/PickHandler.ts
+++ b/@here/harp-mapview/lib/PickHandler.ts
@@ -5,7 +5,7 @@
  */
 
 import { GeometryType, getFeatureId, Technique } from "@here/harp-datasource-protocol";
-import { OrientedBox3 } from "@here/harp-geoutils";
+import { OrientedBox3, TileKey } from "@here/harp-geoutils";
 import * as THREE from "three";
 
 import { IntersectParams } from "./IntersectParams";
@@ -82,6 +82,14 @@ export interface PickResult {
      */
     dataSourceName: string | undefined;
 
+    /**
+     * Data source order, useful for sorting a collection of picking results.
+     * A number for objects/features coming from tiles (as those have data sources attached),
+     * an undefined when objects are added via "mapView.mapAnchors.add(object)" - those are treated as
+     * base layer objects during picking (same as "dataSourceOrder: 0").
+     */
+    dataSourceOrder: number | undefined;
+
     /**
      * Render order of the intersected object.
      */
@@ -90,7 +98,7 @@ export interface PickResult {
     /**
      * An optional feature ID of the picked object.
      * @remarks The ID may be assigned by the object's {@link DataSource}, for example in case of
-     * Optimized Map Vector (OMV) and GeoJSON datata sources.
+     * Optimized Map Vector (OMV) and GeoJSON data sources.
      */
     featureId?: number | string;
 
@@ -114,6 +122,11 @@ export interface PickResult {
      * not be modified.
      */
     userData?: any;
+
+    /**
+     * The tile key containing the picked object.
+     */
+    tileKey?: TileKey;
 }
 
 const tmpV3 = new THREE.Vector3();
@@ -211,7 +224,7 @@ export class PickHandler {
             );
 
             for (const intersect of intersects) {
-                pickListener.addResult(this.createResult(intersect));
+                pickListener.addResult(this.createResult(intersect, tile));
             }
         }
 
@@ -248,13 +261,15 @@ export class PickHandler {
         return this.m_pickingRaycaster;
     }
 
-    private createResult(intersection: THREE.Intersection): PickResult {
+    private createResult(intersection: THREE.Intersection, tile?: Tile): PickResult {
         const pickResult: PickResult = {
             type: PickObjectType.Unspecified,
             point: intersection.point,
             distance: intersection.distance,
             dataSourceName: intersection.object.userData?.dataSource,
-            intersection
+            dataSourceOrder: tile?.dataSource?.dataSourceOrder,
+            intersection,
+            tileKey: tile?.tileKey
         };
 
         if (
diff --git a/@here/harp-mapview/lib/PickListener.ts b/@here/harp-mapview/lib/PickListener.ts
index 8ab21285d4..670be1b444 100644
--- a/@here/harp-mapview/lib/PickListener.ts
+++ b/@here/harp-mapview/lib/PickListener.ts
@@ -9,8 +9,28 @@ import { assert } from "@here/harp-utils";
 import { IntersectParams } from "./IntersectParams";
 import { PickResult } from "./PickHandler";
 
-// Default sorting by distance first and then by reversed render order.
+// Default sorting by:
+// 1. reversed data source order (higher first)
+// 2. distance to the camera (closer first)
+// 3. reversed render order (higher first)
+//
+// This criteria order is temporary, until HARP-16245 gets implemented.
+// Currently, rendering is configured in a way that makes 2D spatials occlude extruded buildings,
+// since spatials belong to a higher layer. Picking order reflects that, but comparison by distance should
+// happen first, once extruded buildings become rendered on top of spatials.
 function defaultSort(lhs: PickResult, rhs: PickResult) {
+    // HARP-14531: Compare by "dataSourceOrder" first,
+    // to ensure that picking results are sorted according to their layers.
+    // The bigger "dataSourceOrder" value is, the higher its stacked in the data model,
+    // meaning the higher it should be appear in the resulting picking collection.
+    // Defaulting "dataSourceOrder" to 0 (base layer) to not skip comparison when it's undefined - in that case
+    // sorting results would not be consistent, as some objects become compared by different criteria.
+    const lDataSourceOrder = lhs.dataSourceOrder ?? 0;
+    const rDataSourceOrder = rhs.dataSourceOrder ?? 0;
+    if (lDataSourceOrder !== rDataSourceOrder) {
+        return rDataSourceOrder - lDataSourceOrder;
+    }
+
     // HARP-14553: Set a distance tolerance to ignore small distance differences between 2D objects
     // that are supposed to lie on the same plane.
     const eps = 1e-4;
@@ -118,7 +138,7 @@ export class PickListener {
     }
 
     /**
-     * Returns the furtherst result collected so far, following the order documented in
+     * Returns the furthest result collected so far, following the order documented in
      * {@link PickListener.results}
      * @returns The furthest pick result, or `undefined` if no result was collected.
      */
@@ -133,9 +153,22 @@ export class PickListener {
     }
 
     private sortResults(): void {
-        if (!this.m_sorted) {
-            this.m_results.sort(defaultSort);
-            this.m_sorted = true;
+        if (this.m_sorted) {
+            return;
         }
+
+        // HARP-14531: group zero-distance results first,
+        // as screen-space objects (e.g. labels) are currently rendered on top.
+        const zeroDistanceGroup: PickResult[] = [];
+        const nonZeroDistanceGroup: PickResult[] = [];
+
+        this.m_results
+            .sort(defaultSort)
+            .forEach(result =>
+                (result.distance === 0 ? zeroDistanceGroup : nonZeroDistanceGroup).push(result)
+            );
+        // both groups are sorted because "this.m_results" are sorted
+        this.m_results = zeroDistanceGroup.concat(nonZeroDistanceGroup);
+        this.m_sorted = true;
     }
 }
diff --git a/@here/harp-mapview/lib/ThemeLoader.ts b/@here/harp-mapview/lib/ThemeLoader.ts
index b0948844e3..4c0307f50d 100644
--- a/@here/harp-mapview/lib/ThemeLoader.ts
+++ b/@here/harp-mapview/lib/ThemeLoader.ts
@@ -10,6 +10,7 @@ import { isJsonExpr } from "@here/harp-datasource-protocol";
 import {
     Definitions,
     FlatTheme,
+    ImageTexture,
     isJsonExprReference,
     Style,
     Styles,
@@ -524,7 +525,42 @@ export class ThemeLoader {
         } else if (theme.styles) {
             styles = { ...theme.styles };
         }
-        return { ...baseTheme, ...theme, definitions, styles };
+
+        return {
+            ...baseTheme,
+            ...theme,
+            // Due to nested structure of the images/textures it needs a
+            // deep merge with a duplicate exclusion.
+            ...ThemeLoader.mergeImageTextures(theme, baseTheme),
+            definitions,
+            styles
+        };
+    }
+
+    private static mergeImageTextures(
+        theme: Theme,
+        baseTheme: Theme
+    ): Pick<FlatTheme, "images" | "imageTextures"> {
+        const images = { ...baseTheme.images, ...theme.images };
+        let imageTextures: ImageTexture[] = [];
+
+        if (!baseTheme.imageTextures && theme.imageTextures) {
+            imageTextures = theme.imageTextures;
+        } else if (baseTheme.imageTextures && !theme.imageTextures) {
+            imageTextures = baseTheme.imageTextures;
+        } else if (baseTheme.imageTextures && theme.imageTextures) {
+            imageTextures = theme.imageTextures.slice();
+            baseTheme.imageTextures.forEach(val => {
+                if (!imageTextures.find(({ name }) => name === val.name)) {
+                    imageTextures.push(val);
+                }
+            });
+        }
+
+        return {
+            images,
+            imageTextures
+        };
     }
 
     private static convertFlatTheme(theme: Theme | FlatTheme): Theme {
diff --git a/@here/harp-mapview/lib/TileObjectsRenderer.ts b/@here/harp-mapview/lib/TileObjectsRenderer.ts
index 43b4756e91..211d4e7441 100644
--- a/@here/harp-mapview/lib/TileObjectsRenderer.ts
+++ b/@here/harp-mapview/lib/TileObjectsRenderer.ts
@@ -158,7 +158,7 @@ export class TileObjectRenderer {
 
         // Temporary workaround due to incorrect comparator type definition:
         // https://github.com/three-types/three-ts-types/issues/41
-        this.m_renderer.setOpaqueSort((painterSortStable as any) as () => void);
+        this.m_renderer.setOpaqueSort(painterSortStable);
     }
 
     private updateStencilRef(object: TileObject) {
diff --git a/@here/harp-mapview/lib/VisibleTileSet.ts b/@here/harp-mapview/lib/VisibleTileSet.ts
index bcc3017334..961c01c81f 100644
--- a/@here/harp-mapview/lib/VisibleTileSet.ts
+++ b/@here/harp-mapview/lib/VisibleTileSet.ts
@@ -1318,6 +1318,11 @@ export class VisibleTileSet {
             const tileKey = DataSourceCache.getKeyForTile(tile);
             if (!retainedTiles.has(tileKey)) {
                 retainedTiles.add(tileKey);
+                // We need to cancel the loader first because if we don't then the call to
+                // tileLoader.loadAndDecode() inside Tile::load will return the existing promise (if
+                // the tile is still loading) and not re-request the tile data from the provider as
+                // required.
+                tile.tileLoader?.cancel();
                 this.addToTaskQueue(tile);
             }
         };
diff --git a/@here/harp-mapview/lib/composing/Outline.ts b/@here/harp-mapview/lib/composing/Outline.ts
index 81902ce254..1c3843fc32 100644
--- a/@here/harp-mapview/lib/composing/Outline.ts
+++ b/@here/harp-mapview/lib/composing/Outline.ts
@@ -339,8 +339,6 @@ export class OutlineEffect {
             vertexShader,
             fragmentShader,
             side: THREE.BackSide,
-            //wireframe: true,
-            skinning: false,
             morphTargets: false,
             morphNormals: false,
             fog: false,
diff --git a/@here/harp-mapview/lib/geometry/TileGeometryCreator.ts b/@here/harp-mapview/lib/geometry/TileGeometryCreator.ts
index ba6a69882a..f95a31e777 100644
--- a/@here/harp-mapview/lib/geometry/TileGeometryCreator.ts
+++ b/@here/harp-mapview/lib/geometry/TileGeometryCreator.ts
@@ -209,6 +209,7 @@ export interface PolygonFadingParameters extends FadingParameters {
 
 /**
  * Support class to create geometry for a {@link Tile} from a {@link @here/harp-datasource-protocol#DecodedTile}.
+ * @internal
  */
 export class TileGeometryCreator {
     private static m_instance: TileGeometryCreator;
@@ -275,13 +276,35 @@ export class TileGeometryCreator {
      *
      * @param tile - The {@link Tile} to process.
      * @param decodedTile - The decodedTile containing the actual tile map data.
+     * @returns Promise resolved when all textures are ready to render.
      */
-    createAllGeometries(tile: Tile, decodedTile: DecodedTile) {
+    createAllGeometries(tile: Tile, decodedTile: DecodedTile): Promise<void> {
         const filter = (technique: IndexedTechnique): boolean => {
             return technique._kindState !== false;
         };
 
-        this.createObjects(tile, decodedTile, filter);
+        let texturesReady: Promise<any> = Promise.resolve();
+        const onNewTexture = (texturePromise: Promise<THREE.Texture>) => {
+            texturesReady = Promise.all([
+                texturesReady,
+                texturePromise
+                    .then(texture => {
+                        tile.addOwnedTexture(texture);
+                        if (!texture.image) {
+                            return Promise.resolve();
+                        }
+                        return new Promise<void>(resolve => {
+                            texture.onUpdate = () => {
+                                (texture.onUpdate as any) = null;
+                                resolve();
+                            };
+                            tile.mapView.renderer.initTexture(texture);
+                        });
+                    })
+                    .catch(() => {}) // Keep waiting for the other textures even if one fails.
+            ]);
+        };
+        this.createObjects(tile, decodedTile, onNewTexture, filter);
 
         this.preparePois(tile, decodedTile);
 
@@ -308,6 +331,7 @@ export class TileGeometryCreator {
             // parent's geometry doesn't show through.
             addGroundPlane(tile, -1);
         }
+        return texturesReady;
     }
 
     createLabelRejectionElements(tile: Tile, decodedTile: DecodedTile) {
@@ -465,6 +489,7 @@ export class TileGeometryCreator {
                         path,
                         tile.offset,
                         tile.dataSource.name,
+                        tile.dataSource.dataSourceOrder,
                         textPath.objInfos,
                         textPath.pathLengthSqr
                     );
@@ -518,6 +543,7 @@ export class TileGeometryCreator {
                         point,
                         tile.offset,
                         tile.dataSource.name,
+                        tile.dataSource.dataSourceOrder,
                         attributes
                     );
                     tile.addTextElement(textElement);
@@ -531,19 +557,21 @@ export class TileGeometryCreator {
      *
      * @param tile - The {@link Tile} to create the geometry on.
      * @param decodedTile - The {@link @here/harp-datasource-protocol#DecodedTile}.
+     * @param onTextureCreated - Callback for each texture created, getting a promise that will be
+     * resolved once the texture is loaded. Texture is not uploaded to GPU.
      * @param techniqueFilter -: Optional filter. Should return true for any technique that is
      *      applicable.
      */
     createObjects(
         tile: Tile,
         decodedTile: DecodedTile,
+        onTextureCreated: (texture: Promise<THREE.Texture>) => void,
         techniqueFilter?: (technique: IndexedTechnique) => boolean
     ) {
         const mapView = tile.mapView;
         const materials: THREE.Material[] = [];
         const extrudedMaterials: THREE.Material[] = [];
         const animatedExtrusionHandler = mapView.animatedExtrusionHandler;
-        const dataSource = tile.dataSource;
         const discreteZoomLevel = Math.floor(mapView.zoomLevel);
         const discreteZoomEnv = new MapEnv({ $zoom: discreteZoomLevel }, mapView.env);
         const objects = tile.objects;
@@ -602,12 +630,6 @@ export class TileGeometryCreator {
                 let material: THREE.Material | undefined = materials[techniqueIndex];
 
                 if (material === undefined) {
-                    const onMaterialUpdated = (texture: THREE.Texture) => {
-                        dataSource.requestUpdate();
-                        if (texture !== undefined) {
-                            tile.addOwnedTexture(texture);
-                        }
-                    };
                     material = createMaterial(
                         mapView.renderer.capabilities,
                         {
@@ -616,7 +638,7 @@ export class TileGeometryCreator {
                             fog: mapView.scene.fog !== null,
                             shadowsEnabled: mapView.shadowsEnabled
                         },
-                        onMaterialUpdated
+                        onTextureCreated
                     );
                     if (material === undefined) {
                         continue;
diff --git a/@here/harp-mapview/lib/geometry/TileGeometryLoader.ts b/@here/harp-mapview/lib/geometry/TileGeometryLoader.ts
index abd0a76b6a..f56f827139 100644
--- a/@here/harp-mapview/lib/geometry/TileGeometryLoader.ts
+++ b/@here/harp-mapview/lib/geometry/TileGeometryLoader.ts
@@ -319,10 +319,10 @@ export class TileGeometryLoader {
         this.m_state = TileGeometryLoaderState.CreationQueued;
     }
 
-    private createGeometry(
+    private async createGeometry(
         enabledKinds: GeometryKindSet | undefined,
         disabledKinds: GeometryKindSet | undefined
-    ) {
+    ): Promise<void> {
         if (this.m_state === TileGeometryLoaderState.CreatingGeometry) {
             return;
         }
@@ -347,8 +347,7 @@ export class TileGeometryLoader {
         tile.clear();
         // Set up techniques which should be processed.
         geometryCreator.initDecodedTile(decodedTile, enabledKinds, disabledKinds);
-        geometryCreator.createAllGeometries(tile, decodedTile);
-
+        await geometryCreator.createAllGeometries(tile, decodedTile);
         if (stats.enabled) {
             this.addStats(stats, now);
         }
diff --git a/@here/harp-mapview/lib/poi/PoiManager.ts b/@here/harp-mapview/lib/poi/PoiManager.ts
index 74c87b8600..811e549c37 100644
--- a/@here/harp-mapview/lib/poi/PoiManager.ts
+++ b/@here/harp-mapview/lib/poi/PoiManager.ts
@@ -382,6 +382,7 @@ export class PoiManager {
                 positionArray,
                 tile.offset,
                 tile.dataSource.name,
+                tile.dataSource.dataSourceOrder,
                 getAttributes(poiGeometry)
             );
 
@@ -408,6 +409,7 @@ export class PoiManager {
                     getPosition(positions, worldOffsetX, i),
                     tile.offset,
                     tile.dataSource.name,
+                    tile.dataSource.dataSourceOrder,
                     getAttributes(poiGeometry, i),
                     undefined,
                     offsetDirection
diff --git a/@here/harp-mapview/lib/text/TextElement.ts b/@here/harp-mapview/lib/text/TextElement.ts
index fca09dff49..97142f94c4 100644
--- a/@here/harp-mapview/lib/text/TextElement.ts
+++ b/@here/harp-mapview/lib/text/TextElement.ts
@@ -395,7 +395,8 @@ export class TextElement {
         public fadeFar?: number,
         readonly tileOffset?: number,
         readonly offsetDirection?: number,
-        readonly dataSourceName?: string
+        readonly dataSourceName?: string,
+        readonly dataSourceOrder?: number
     ) {
         if (renderParams instanceof TextRenderStyle) {
             this.renderStyle = renderParams;
diff --git a/@here/harp-mapview/lib/text/TextElementBuilder.ts b/@here/harp-mapview/lib/text/TextElementBuilder.ts
index fa062c3943..37cf02e4b2 100644
--- a/@here/harp-mapview/lib/text/TextElementBuilder.ts
+++ b/@here/harp-mapview/lib/text/TextElementBuilder.ts
@@ -205,6 +205,7 @@ export class TextElementBuilder {
         points: THREE.Vector3 | THREE.Vector3[],
         tileOffset: number,
         dataSourceName: string,
+        dataSourceOrder: number,
         attributes?: AttributeMap,
         pathLengthSqr?: number,
         offsetDirection?: number
@@ -232,7 +233,8 @@ export class TextElementBuilder {
             this.m_fadeFar,
             tileOffset,
             offsetDirection,
-            dataSourceName
+            dataSourceName,
+            dataSourceOrder
         );
         textElement.minZoomLevel = this.m_minZoomLevel;
         textElement.maxZoomLevel = this.m_maxZoomLevel;
diff --git a/@here/harp-mapview/lib/text/TextElementsRenderer.ts b/@here/harp-mapview/lib/text/TextElementsRenderer.ts
index 816bf6127d..cca40c491e 100644
--- a/@here/harp-mapview/lib/text/TextElementsRenderer.ts
+++ b/@here/harp-mapview/lib/text/TextElementsRenderer.ts
@@ -703,6 +703,7 @@ export class TextElementsRenderer {
                 featureId: textElement.featureId,
                 userData: textElement.userData,
                 dataSourceName: textElement.dataSourceName,
+                dataSourceOrder: textElement.dataSourceOrder,
                 text: textElement.text
             };
 
diff --git a/@here/harp-mapview/package.json b/@here/harp-mapview/package.json
index 0064d82b10..223207fa55 100644
--- a/@here/harp-mapview/package.json
+++ b/@here/harp-mapview/package.json
@@ -51,7 +51,7 @@
         "@types/mocha": "^8.2.0",
         "@types/node": "^14.0.5",
         "@types/sinon": "^9.0.10",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "chai": "^4.0.2",
         "chai-as-promised": "^7.1.1",
         "copyfiles": "^2.2.0",
@@ -59,11 +59,11 @@
         "mocha": "^8.2.1",
         "sinon": "^9.2.2",
         "source-map-support": "^0.5.19",
-        "three": "^0.127.0",
+        "three": "^0.129.0",
         "typescript": "^4.1.2"
     },
     "peerDependencies": {
-        "three": "^0.127.0"
+        "three": "^0.129.0"
     },
     "publishConfig": {
         "access": "public"
diff --git a/@here/harp-mapview/test/DecodedTileHelpersTest.ts b/@here/harp-mapview/test/DecodedTileHelpersTest.ts
index ad080e856c..a93043bd97 100644
--- a/@here/harp-mapview/test/DecodedTileHelpersTest.ts
+++ b/@here/harp-mapview/test/DecodedTileHelpersTest.ts
@@ -11,17 +11,23 @@ import {
     ShaderTechnique,
     SolidLineTechnique,
     StandardTechnique,
-    Technique
+    Technique,
+    TextureProperties
 } from "@here/harp-datasource-protocol";
 import { TileKey } from "@here/harp-geoutils";
 import { MapMeshStandardMaterial, SolidLineMaterial } from "@here/harp-materials";
 import { assertLogsSync } from "@here/harp-test-utils";
 import { LoggerManager } from "@here/harp-utils";
-import { assert, expect } from "chai";
+import * as chai from "chai";
+import * as chaiAsPromised from "chai-as-promised";
 import * as sinon from "sinon";
 import * as THREE from "three";
+chai.use(chaiAsPromised);
+// Needed for using assert.isFulfilled for example
+const { expect, assert } = chai;
 
 import { DisplacedMesh } from "../lib/geometry/DisplacedMesh";
+import { toTextureFilter, toWrappingMode } from "../lib/ThemeHelpers";
 import {
     applyBaseColorToMaterial,
     buildObject,
@@ -42,6 +48,7 @@ describe("DecodedTileHelpers", function () {
     const env = new MapEnv({ $zoom: 10, $pixelToMeters: 2 });
     const rendererCapabilities = { isWebGL2: false } as any;
     const sandbox = sinon.createSandbox();
+    const wait = (ms: number = 0) => new Promise(res => setTimeout(res, ms));
 
     afterEach(function () {
         sandbox.restore();
@@ -187,29 +194,43 @@ describe("DecodedTileHelpers", function () {
             };
 
             const callbackSpy = sandbox.spy();
+            let onImageLoad: ((image: HTMLImageElement) => void) | undefined;
             sandbox
                 .stub(THREE.ImageLoader.prototype, "load")
                 .callsFake((url, onLoad?, _onProgress?, _onError?) => {
                     assert.equal(url, technique.map);
-                    onLoad?.(fakeImageElement);
+                    onImageLoad = onLoad;
                     return fakeImageElement;
                 });
-            let material: MapMeshStandardMaterial | undefined;
-            await new Promise<void>((resolve, _) => {
-                material = createMaterial(
-                    rendererCapabilities,
-                    {
-                        technique,
-                        env
-                    },
-                    callbackSpy
-                ) as MapMeshStandardMaterial;
-                resolve();
+
+            const material = createMaterial(
+                rendererCapabilities,
+                {
+                    technique,
+                    env
+                },
+                callbackSpy
+            ) as MapMeshStandardMaterial;
+            assert.isDefined(onImageLoad);
+            assert.isTrue(callbackSpy.called);
+
+            // Check that texture promised is not yet resolved.
+            let textureLoaded = false;
+            const texturePromise = callbackSpy.firstCall.args[0].then(() => {
+                textureLoaded = true;
             });
+
+            await wait();
+            assert.isFalse(textureLoaded);
             assert.exists(material);
+            assert.notExists(material!.map);
+
+            // Call image load callback, promise must now be resolved and texture set in material.
+            onImageLoad!(fakeImageElement);
+            await assert.isFulfilled(texturePromise);
+            assert.isTrue(textureLoaded);
             assert.exists(material!.map);
             assert.strictEqual(material!.map!.image, fakeImageElement);
-            assert.isTrue(callbackSpy.called);
         });
 
         it("creates texture from raw texture buffer", function () {
@@ -237,6 +258,70 @@ describe("DecodedTileHelpers", function () {
             assert.exists(material);
             assert.exists(material.map);
             assert.isTrue(callbackSpy.called);
+            const texturePromise = callbackSpy.firstCall.args[0];
+            return assert.isFulfilled(texturePromise);
+        });
+
+        it("rejects texture promise if raw texture buffer does not have properties", function () {
+            const callbackSpy = sinon.spy();
+            const technique: StandardTechnique = {
+                name: "standard",
+                renderOrder: 0,
+                map: {
+                    buffer: new ArrayBuffer(1),
+                    type: "image/raw"
+                }
+            };
+            const material = createMaterial(
+                rendererCapabilities,
+                {
+                    technique,
+                    env
+                },
+                callbackSpy
+            ) as MapMeshStandardMaterial;
+            assert.exists(material);
+            assert.notExists(material.map);
+            assert.isTrue(callbackSpy.called);
+            const texturePromise = callbackSpy.firstCall.args[0];
+            return assert.isRejected(texturePromise);
+        });
+
+        it("inits texture properties with values from technique", function () {
+            const technique: StandardTechnique = {
+                name: "standard",
+                renderOrder: 0,
+                map: {
+                    buffer: new ArrayBuffer(1),
+                    type: "image/raw",
+                    dataTextureProperties: {
+                        width: 1,
+                        height: 1
+                    }
+                },
+                mapProperties: {
+                    wrapS: "mirror",
+                    wrapT: "repeat",
+                    magFilter: "nearest",
+                    minFilter: "linear",
+                    flipY: true,
+                    repeatU: 3,
+                    repeatV: 2
+                }
+            };
+            const material = createMaterial(rendererCapabilities, {
+                technique,
+                env
+            }) as MapMeshStandardMaterial;
+            assert.exists(material?.map);
+            const map = material!.map!;
+            const expectedProps = technique.mapProperties! as TextureProperties;
+            assert.equal(map.wrapS, toWrappingMode(expectedProps.wrapS!));
+            assert.equal(map.magFilter, toTextureFilter(expectedProps.magFilter!));
+            assert.equal(map.minFilter, toTextureFilter(expectedProps.minFilter!));
+            assert.equal(map.flipY, expectedProps.flipY);
+            assert.equal(map.repeat.x, expectedProps.repeatU);
+            assert.equal(map.repeat.y, expectedProps.repeatV);
         });
 
         itBrowserOnly("creates texture from png texture buffer", function () {
diff --git a/@here/harp-mapview/test/FakeOmvDataSource.ts b/@here/harp-mapview/test/FakeOmvDataSource.ts
index b090a03433..fbfe9c0461 100644
--- a/@here/harp-mapview/test/FakeOmvDataSource.ts
+++ b/@here/harp-mapview/test/FakeOmvDataSource.ts
@@ -26,10 +26,20 @@ export class FakeTileLoader implements ITileLoader {
         geometries: []
     };
 
+    reject?: (reason?: any) => void;
+
     isFinished: boolean = false;
 
     loadAndDecode(): Promise<TileLoaderState> {
-        return Promise.resolve(TileLoaderState.Ready);
+        this.state = TileLoaderState.Loading;
+        return new Promise((resolve, reject) => {
+            this.reject = reject;
+            // We use setTimeout to delay the resolve
+            setTimeout(() => {
+                this.state = TileLoaderState.Loaded;
+                resolve(TileLoaderState.Ready);
+            });
+        });
     }
 
     waitSettled(): Promise<TileLoaderState> {
@@ -37,7 +47,8 @@ export class FakeTileLoader implements ITileLoader {
     }
 
     cancel(): void {
-        // Not covered with tests yet
+        this.state = TileLoaderState.Canceled;
+        this.reject!(this.state);
     }
 }
 export class FakeOmvDataSource extends DataSource {
diff --git a/@here/harp-mapview/test/PickHandlerTest.ts b/@here/harp-mapview/test/PickHandlerTest.ts
index 4d699da09c..f79edf69ec 100644
--- a/@here/harp-mapview/test/PickHandlerTest.ts
+++ b/@here/harp-mapview/test/PickHandlerTest.ts
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { TileKey } from "@here/harp-geoutils";
 import { expect } from "chai";
 import * as sinon from "sinon";
 import * as THREE from "three";
@@ -15,11 +16,11 @@ import { Tile } from "../lib/Tile";
 describe("PickHandler", function () {
     let pickHandler: PickHandler;
     let mapViewMock: MapView;
-
+    let tile: Tile;
     beforeEach(function () {
         const size = new THREE.Vector2(800, 600);
         const camera = new THREE.PerspectiveCamera();
-        const tile = ({
+        tile = ({
             boundingBox: {
                 extents: new THREE.Vector3(1252344.2714, 1252344.2714, 11064),
                 position: new THREE.Vector3(21289852.6142, 26299229.6999, 11064),
@@ -28,7 +29,8 @@ describe("PickHandler", function () {
                 zAxis: new THREE.Vector3(0, 0, 1)
             },
             computeWorldOffsetX: () => 0,
-            dependencies: []
+            dependencies: [],
+            tileKey: TileKey.fromRowColumnLevel(1, 2, 3)
         } as unknown) as Tile;
 
         mapViewMock = ({
@@ -291,5 +293,40 @@ describe("PickHandler", function () {
                 name: "abruzzo"
             });
         });
+
+        it("returns an array of PickResult objects each having the expected properties", function () {
+            sinon
+                .stub(mapViewMock, "getWorldPositionAt")
+                .callsFake(() => new THREE.Vector3(21604645.272347387, 25315004.93397993, 0));
+
+            raycasterFromScreenPointStub.callsFake((x: number, y: number) => {
+                const raycaster = raycasterFromScreenPointStub.wrappedMethod.call(
+                    pickHandler,
+                    x,
+                    y
+                );
+
+                sinon
+                    .stub(raycaster, "intersectObjects")
+                    .callsFake((objects, recursive, target: THREE.Intersection[] = []) => {
+                        target.push({
+                            point: new THREE.Vector3(174781.2243, 62415.6655, -2160787.9966),
+                            distance: 2168613.8654252696,
+                            object: ({
+                                userData: {}
+                            } as any) as THREE.Object3D
+                        });
+
+                        return target;
+                    });
+
+                return raycaster;
+            });
+
+            const results = pickHandler.intersectMapObjects(467, 276);
+            expect(results).not.to.be.empty;
+            expect(results[0].tileKey).to.equal(tile.tileKey);
+            // TODO: expand to other properties in PickResult
+        });
     });
 });
diff --git a/@here/harp-mapview/test/PickListenerTest.ts b/@here/harp-mapview/test/PickListenerTest.ts
index 6beb0b9361..77774ced19 100644
--- a/@here/harp-mapview/test/PickListenerTest.ts
+++ b/@here/harp-mapview/test/PickListenerTest.ts
@@ -21,6 +21,7 @@ function createIntersection(dataSource: string | undefined): THREE.Intersection
 describe("PickListener", function () {
     const point = new THREE.Vector3();
     const dataSourceName = "anonymous";
+    const dataSourceOrder = 0;
 
     describe("addResult", function () {
         it("adds all results for new features", function () {
@@ -34,7 +35,8 @@ describe("PickListener", function () {
                 featureId: 1,
                 userData,
                 intersection,
-                dataSourceName
+                dataSourceName,
+                dataSourceOrder
             });
 
             // different type
@@ -45,7 +47,8 @@ describe("PickListener", function () {
                 featureId: 1,
                 userData,
                 intersection,
-                dataSourceName
+                dataSourceName,
+                dataSourceOrder
             });
 
             // different data source.
@@ -56,7 +59,8 @@ describe("PickListener", function () {
                 featureId: 1,
                 userData,
                 intersection: createIntersection("ds2"),
-                dataSourceName
+                dataSourceName,
+                dataSourceOrder
             });
 
             // different feature id
@@ -67,7 +71,8 @@ describe("PickListener", function () {
                 featureId: 2,
                 userData,
                 intersection,
-                dataSourceName
+                dataSourceName,
+                dataSourceOrder
             });
 
             // no feature id and different user data.
@@ -77,7 +82,8 @@ describe("PickListener", function () {
                 distance: 1,
                 userData: {},
                 intersection,
-                dataSourceName
+                dataSourceName,
+                dataSourceOrder
             });
             listener.finish();
             expect(listener.results).to.have.lengthOf(5);
@@ -97,7 +103,8 @@ describe("PickListener", function () {
                     featureId: 1,
                     userData,
                     intersection,
-                    dataSourceName
+                    dataSourceName,
+                    dataSourceOrder
                 };
                 listener.addResult(firstResult);
 
@@ -107,7 +114,8 @@ describe("PickListener", function () {
                     distance: 2,
                     featureId: 1,
                     intersection,
-                    dataSourceName
+                    dataSourceName,
+                    dataSourceOrder
                 });
                 listener.finish();
 
@@ -124,7 +132,8 @@ describe("PickListener", function () {
                     distance: 1,
                     userData,
                     intersection,
-                    dataSourceName
+                    dataSourceName,
+                    dataSourceOrder
                 };
                 listener.addResult(firstResult);
 
@@ -134,7 +143,8 @@ describe("PickListener", function () {
                     distance: 2,
                     userData,
                     intersection,
-                    dataSourceName
+                    dataSourceName,
+                    dataSourceOrder
                 });
                 listener.finish();
 
@@ -154,7 +164,8 @@ describe("PickListener", function () {
                 featureId: 1,
                 userData,
                 intersection,
-                dataSourceName
+                dataSourceName,
+                dataSourceOrder
             });
 
             const closerResult: PickResult = {
@@ -163,7 +174,8 @@ describe("PickListener", function () {
                 distance: 1,
                 featureId: 1,
                 intersection,
-                dataSourceName
+                dataSourceName,
+                dataSourceOrder
             };
             listener.addResult(closerResult);
             listener.finish();
@@ -174,36 +186,138 @@ describe("PickListener", function () {
     });
 
     describe("finish", function () {
-        it("orders the results", function () {
-            const listener = new PickListener();
+        it("orders the results by 'dataSourceOrder' first, then by 'distance' and 'renderOrder'", function () {
             const expectedResults: PickResult[] = [
                 {
                     type: PickObjectType.Point,
                     point,
-                    distance: 0,
+                    distance: 10,
+                    renderOrder: 2,
+                    dataSourceName: "layer-2",
+                    dataSourceOrder: 2
+                },
+                {
+                    type: PickObjectType.Point,
+                    point,
+                    distance: 20,
                     renderOrder: 1,
-                    dataSourceName
+                    dataSourceName: "layer-2",
+                    dataSourceOrder: 2
                 },
                 {
                     type: PickObjectType.Point,
                     point,
-                    distance: 1,
+                    distance: 5,
                     renderOrder: 3,
-                    dataSourceName
+                    dataSourceName: "layer-1",
+                    dataSourceOrder: 1
                 },
                 {
                     type: PickObjectType.Point,
                     point,
-                    distance: 1,
+                    distance: 5,
+                    renderOrder: 2,
+                    dataSourceName: "layer-1",
+                    dataSourceOrder: 1
+                }
+            ];
+
+            const indexPermutations: number[][] = [
+                [0, 1, 2, 3],
+                [0, 1, 3, 2],
+                [0, 2, 1, 3],
+                [0, 2, 3, 1],
+                [0, 3, 1, 2],
+                [0, 3, 2, 1],
+                [1, 0, 2, 3],
+                [1, 0, 3, 2],
+                [1, 2, 0, 3],
+                [1, 2, 3, 0],
+                [1, 3, 0, 2],
+                [1, 3, 2, 0],
+                [2, 0, 1, 3],
+                [2, 0, 3, 1],
+                [2, 1, 0, 3],
+                [2, 1, 3, 0],
+                [2, 3, 0, 1],
+                [2, 3, 1, 0],
+                [3, 0, 1, 2],
+                [3, 0, 2, 1],
+                [3, 1, 0, 2],
+                [3, 1, 2, 0],
+                [3, 2, 0, 1],
+                [3, 2, 1, 0]
+            ];
+
+            indexPermutations.forEach(indexList => {
+                const listener = new PickListener();
+
+                indexList.forEach(i => listener.addResult(expectedResults[i]));
+                listener.finish();
+
+                expect(
+                    listener.results,
+                    `input index list: ${JSON.stringify(indexList)}`
+                ).to.have.ordered.members(expectedResults);
+            });
+        });
+
+        it("returns zero-distance (screen-space) results first", function () {
+            const listener = new PickListener();
+            const expectedResults: PickResult[] = [
+                {
+                    type: PickObjectType.Point,
+                    point,
+                    distance: 0,
                     renderOrder: 2,
-                    dataSourceName
+                    dataSourceName: "layer-2",
+                    dataSourceOrder: 2
+                },
+                {
+                    type: PickObjectType.Point,
+                    point,
+                    distance: 0,
+                    renderOrder: 3,
+                    dataSourceName: "layer-1",
+                    dataSourceOrder: 1
+                },
+                {
+                    type: PickObjectType.Point,
+                    point,
+                    distance: 24,
+                    renderOrder: 20,
+                    dataSourceName: "layer-2",
+                    dataSourceOrder: 2
+                },
+                {
+                    type: PickObjectType.Point,
+                    point,
+                    distance: 24,
+                    renderOrder: 19,
+                    dataSourceName: "layer-2",
+                    dataSourceOrder: 2
+                },
+                {
+                    type: PickObjectType.Point,
+                    point,
+                    distance: 200,
+                    renderOrder: 4,
+                    dataSourceName: "layer-0",
+                    dataSourceOrder: 0
                 }
             ];
+
             listener.addResult(expectedResults[2]);
+            listener.addResult(expectedResults[4]);
             listener.addResult(expectedResults[1]);
+            listener.addResult(expectedResults[3]);
             listener.addResult(expectedResults[0]);
             listener.finish();
 
+            // 0 and 1 are ranked higher because of 'distance: 0'
+            // 0 precedes 1 because of higher 'dataSourceOrder'
+            // 2 precedes 3 because of higher 'renderOrder' while 'dataSourceOrder' and 'distance' are same
+            // 3 precedes 4 because of higher 'dataSourceOrder'
             expect(listener.results).to.have.ordered.members(expectedResults);
         });
 
@@ -214,16 +328,18 @@ describe("PickListener", function () {
                 {
                     type: PickObjectType.Point,
                     point,
-                    distance: eps,
+                    distance: 300 + eps,
                     renderOrder: 2,
-                    dataSourceName
+                    dataSourceName,
+                    dataSourceOrder
                 },
                 {
                     type: PickObjectType.Point,
                     point,
-                    distance: 0,
+                    distance: 300,
                     renderOrder: 1,
-                    dataSourceName
+                    dataSourceName,
+                    dataSourceOrder
                 }
             ];
             listener.addResult(expectedResults[1]);
@@ -242,14 +358,16 @@ describe("PickListener", function () {
                     point,
                     distance: 0,
                     renderOrder: 1,
-                    dataSourceName
+                    dataSourceName,
+                    dataSourceOrder
                 },
                 {
                     type: PickObjectType.Point,
                     point,
                     distance: 1,
                     renderOrder: 3,
-                    dataSourceName
+                    dataSourceName,
+                    dataSourceOrder
                 }
             ];
             listener.addResult(results[1]);
@@ -262,12 +380,12 @@ describe("PickListener", function () {
     });
 
     describe("closestResult", function () {
-        it("returns undefined if there's no results", function () {
+        it("returns undefined if there are no results", function () {
             const listener = new PickListener();
             expect(listener.closestResult).to.be.undefined;
         });
 
-        it("returns closest result when there's some results", function () {
+        it("returns closest result when there are some results", function () {
             const listener = new PickListener();
             const results: PickResult[] = [
                 {
@@ -275,14 +393,16 @@ describe("PickListener", function () {
                     point,
                     distance: 0,
                     renderOrder: 1,
-                    dataSourceName
+                    dataSourceName,
+                    dataSourceOrder
                 },
                 {
                     type: PickObjectType.Point,
                     point,
                     distance: 1,
                     renderOrder: 3,
-                    dataSourceName
+                    dataSourceName,
+                    dataSourceOrder
                 }
             ];
             listener.addResult(results[1]);
@@ -294,12 +414,12 @@ describe("PickListener", function () {
     });
 
     describe("furthestResult", function () {
-        it("returns undefined if there's no results", function () {
+        it("returns undefined if there are no results", function () {
             const listener = new PickListener();
             expect(listener.furthestResult).to.be.undefined;
         });
 
-        it("returns furtherst result when there's some results", function () {
+        it("returns furthest result when there are some results", function () {
             const listener = new PickListener();
             const results: PickResult[] = [
                 {
@@ -307,14 +427,16 @@ describe("PickListener", function () {
                     point,
                     distance: 0,
                     renderOrder: 1,
-                    dataSourceName
+                    dataSourceName,
+                    dataSourceOrder
                 },
                 {
                     type: PickObjectType.Point,
                     point,
                     distance: 1,
                     renderOrder: 3,
-                    dataSourceName
+                    dataSourceName,
+                    dataSourceOrder
                 }
             ];
             listener.addResult(results[1]);
diff --git a/@here/harp-mapview/test/TextElementBuilderTest.ts b/@here/harp-mapview/test/TextElementBuilderTest.ts
index 5ba8609c0a..7206764954 100644
--- a/@here/harp-mapview/test/TextElementBuilderTest.ts
+++ b/@here/harp-mapview/test/TextElementBuilderTest.ts
@@ -29,6 +29,7 @@ describe("TextElementBuilder", function () {
         getLayoutStyle: () => layoutStyle
     } as any) as TileTextStyleCache;
     const dataSourceName = "anonymous";
+    const dataSourceOrder = 0;
 
     function buildPoiTechnique(properties: {}): PoiTechnique & IndexedTechniqueParams {
         return { name: "labeled-icon", _index: 0, _styleSetIndex: 0, ...properties };
@@ -48,8 +49,8 @@ describe("TextElementBuilder", function () {
         const builder = new TextElementBuilder(env, styleCache, 0);
         const label1 = builder
             .withTechnique(textTechnique)
-            .build("one", new Vector3(), 0, dataSourceName);
-        const label2 = builder.build("two", new Vector3(), 0, dataSourceName);
+            .build("one", new Vector3(), 0, dataSourceName, dataSourceOrder);
+        const label2 = builder.build("two", new Vector3(), 0, dataSourceName, dataSourceOrder);
 
         expect(label1?.priority).equals(label2?.priority).and.equals(textTechnique.priority);
     });
@@ -62,8 +63,8 @@ describe("TextElementBuilder", function () {
         const label1 = builder
             .withTechnique(poiTechnique)
             .withIcon(iconName, shieldGroupIndex)
-            .build("one", new Vector3(), 0, dataSourceName);
-        const label2 = builder.build("two", new Vector3(), 0, dataSourceName);
+            .build("one", new Vector3(), 0, dataSourceName, dataSourceOrder);
+        const label2 = builder.build("two", new Vector3(), 0, dataSourceName, dataSourceOrder);
 
         expect(label1.poiInfo?.imageTextureName)
             .equals(label2.poiInfo?.imageTextureName)
@@ -83,10 +84,12 @@ describe("TextElementBuilder", function () {
             textReserveSpace: true
         });
         const builder = new TextElementBuilder(env, styleCache, 0);
-        const poi = builder.withTechnique(poiTechnique).build("", new Vector3(), 0, dataSourceName);
+        const poi = builder
+            .withTechnique(poiTechnique)
+            .build("", new Vector3(), 0, dataSourceName, dataSourceOrder);
         const lineMarker = builder
             .withTechnique(lineMarkerTechnique)
-            .build("", new Vector3(), 0, dataSourceName);
+            .build("", new Vector3(), 0, dataSourceName, dataSourceOrder);
 
         expect(poi.mayOverlap).equals(poiTechnique.textMayOverlap);
         expect(poi.reserveSpace).equals(poiTechnique.textReserveSpace);
@@ -99,7 +102,7 @@ describe("TextElementBuilder", function () {
         const poi = new TextElementBuilder(env, styleCache, 0)
             .withTechnique(poiTechnique)
             .withIcon(undefined)
-            .build("", new Vector3(), 0, dataSourceName);
+            .build("", new Vector3(), 0, dataSourceName, dataSourceOrder);
         expect(poi.poiInfo).undefined;
     });
 
@@ -117,7 +120,7 @@ describe("TextElementBuilder", function () {
         const poi = new TextElementBuilder(env, styleCache, 0)
             .withTechnique(poiTechnique)
             .withIcon("")
-            .build("", new Vector3(), 0, dataSourceName);
+            .build("", new Vector3(), 0, dataSourceName, dataSourceOrder);
         expect(poi.minZoomLevel).equals(Math.min(iconMinZoomLevel, textMinZoomLevel));
         expect(poi.maxZoomLevel).equals(Math.max(iconMaxZoomLevel, textMaxZoomLevel));
     });
@@ -127,7 +130,7 @@ describe("TextElementBuilder", function () {
         const poi = new TextElementBuilder(env, styleCache, 0)
             .withTechnique(poiTechnique)
             .withIcon("dummy")
-            .build("", new Vector3(), 0, dataSourceName);
+            .build("", new Vector3(), 0, dataSourceName, dataSourceOrder);
         expect(poi.renderOrder)
             .equals(poi.poiInfo?.renderOrder)
             .and.equals(poiTechnique.renderOrder);
@@ -139,7 +142,7 @@ describe("TextElementBuilder", function () {
         const poi = new TextElementBuilder(env, styleCache, baseRenderOrder)
             .withTechnique(poiTechnique)
             .withIcon("dummy")
-            .build("", new Vector3(), 0, dataSourceName);
+            .build("", new Vector3(), 0, dataSourceName, dataSourceOrder);
         expect(poi.renderOrder)
             .equals(poi.poiInfo?.renderOrder)
             .and.equals(
diff --git a/@here/harp-mapview/test/ThemeLoaderTest.ts b/@here/harp-mapview/test/ThemeLoaderTest.ts
index 1324e43ef5..9c96c89499 100644
--- a/@here/harp-mapview/test/ThemeLoaderTest.ts
+++ b/@here/harp-mapview/test/ThemeLoaderTest.ts
@@ -306,6 +306,71 @@ describe("ThemeLoader", function () {
             assert.deepEqual(result.definitions!.roadColor, { type: "color", value: "#fff" });
             assert.deepEqual(result.definitions!.waterColor, { type: "color", value: "#0f0" });
         });
+        it("supports multiple inheritance with textures", async function () {
+            const inheritedTheme: Theme = {
+                extends: [
+                    {
+                        images: {
+                            foo: {
+                                url: "icons://maki_icons.png",
+                                preload: true
+                            },
+                            baz: {
+                                url: "icons://maki_icons.png",
+                                preload: true
+                            }
+                        },
+                        imageTextures: [
+                            {
+                                name: "foo",
+                                image: "foo"
+                            },
+                            {
+                                name: "baz",
+                                image: "baz"
+                            }
+                        ]
+                    },
+                    {
+                        images: {
+                            bar: {
+                                url: "icons://maki_icons.png",
+                                preload: true
+                            },
+                            baz: {
+                                url: "icons://override.png",
+                                atlas: "icons://icons/maki_icons.json",
+                                preload: true
+                            }
+                        },
+                        imageTextures: [
+                            {
+                                name: "bar",
+                                image: "bar"
+                            },
+                            {
+                                name: "baz",
+                                image: "baz"
+                            }
+                        ]
+                    }
+                ]
+            };
+
+            const result = await ThemeLoader.load(inheritedTheme);
+            assert.exists(result.images?.foo);
+            assert.exists(result.images?.bar);
+            assert.exists(result.images?.baz);
+
+            assert.equal(result.images?.baz.url, "icons://override.png");
+            assert.exists(result.images?.baz.atlas);
+
+            assert.deepEqual(result.imageTextures?.map(imageTexture => imageTexture.name).sort(), [
+                "bar",
+                "baz",
+                "foo"
+            ]);
+        });
     });
 
     describe("#load support for inheritance and optional reference resolving", function () {
diff --git a/@here/harp-mapview/test/TileGeometryCreatorTest.ts b/@here/harp-mapview/test/TileGeometryCreatorTest.ts
index 32d363156d..f42ce51282 100644
--- a/@here/harp-mapview/test/TileGeometryCreatorTest.ts
+++ b/@here/harp-mapview/test/TileGeometryCreatorTest.ts
@@ -21,11 +21,16 @@ import {
     webMercatorTilingScheme
 } from "@here/harp-geoutils";
 import { MapMeshBasicMaterial } from "@here/harp-materials";
-import { assert, expect } from "chai";
+import * as chai from "chai";
+import * as chaiAsPromised from "chai-as-promised";
 import * as sinon from "sinon";
 import * as THREE from "three";
 import { RawShaderMaterial } from "three";
 
+chai.use(chaiAsPromised);
+// Needed for using assert(...).isFulfilled for example
+const { expect, assert } = chai;
+
 import { DataSource } from "../lib/DataSource";
 import { isDepthPrePassMesh } from "../lib/DepthPrePass";
 import { DisplacementMap } from "../lib/DisplacementMap";
@@ -146,6 +151,49 @@ function getFillTile(): DecodedTile {
     };
 }
 
+function getTexturedTile(): DecodedTile {
+    return {
+        geometries: [
+            {
+                type: GeometryType.Polygon,
+                vertexAttributes: [
+                    {
+                        name: "position",
+                        buffer: new Float32Array([1.0, 2.0, 3.0]),
+                        type: "float",
+                        itemCount: 3
+                    }
+                ],
+                groups: [{ start: 0, count: 1, technique: 0, createdOffsets: [] }]
+            }
+        ],
+        techniques: [
+            {
+                name: "standard",
+                renderOrder: 0,
+                map: {
+                    buffer: new ArrayBuffer(1),
+                    type: "image/raw",
+                    dataTextureProperties: {
+                        width: 1,
+                        height: 1
+                    }
+                },
+                alphaMap: {
+                    buffer: new ArrayBuffer(1),
+                    type: "image/raw",
+                    dataTextureProperties: {
+                        width: 1,
+                        height: 1
+                    }
+                },
+                _index: 0,
+                _styleSetIndex: 0
+            }
+        ]
+    };
+}
+
 function getSolidLineTile(): DecodedTile {
     return {
         geometries: [
@@ -185,6 +233,7 @@ describe("TileGeometryCreator", () => {
     let newTile: Tile;
     const tgc = TileGeometryCreator.instance;
     let mapView: FakeMapView;
+    let textureCallback: sinon.SinonStub;
     const sandbox = sinon.createSandbox();
 
     beforeEach(function () {
@@ -193,6 +242,7 @@ describe("TileGeometryCreator", () => {
         mockDatasource.getTilingScheme.callsFake(() => webMercatorTilingScheme);
         sandbox.stub(mockDatasource, "projection").get(() => mercatorProjection);
         sandbox.stub(mockDatasource, "mapView").get(() => mapView);
+        textureCallback = sandbox.stub();
         newTile = new Tile(
             (mockDatasource as unknown) as DataSource,
             TileKey.fromRowColumnLevel(0, 0, 0)
@@ -232,7 +282,7 @@ describe("TileGeometryCreator", () => {
             ],
             techniques: [{ name: "terrain", renderOrder: 0, _index: 0, _styleSetIndex: 0 }]
         };
-        tgc.createObjects(newTile, decodedTile);
+        tgc.createObjects(newTile, decodedTile, textureCallback);
         assert.equal(newTile.objects.length, 1);
         const userData = newTile.objects[0].userData;
         expect(userData).to.be.an("object");
@@ -256,21 +306,21 @@ describe("TileGeometryCreator", () => {
             });
             it("extruded polygon materials have expected glslVersion", () => {
                 const decodedTile: DecodedTile = getExtrudedPolygonTile();
-                tgc.createObjects(newTile, decodedTile);
+                tgc.createObjects(newTile, decodedTile, textureCallback);
 
                 checkGlslVersion(newTile.objects, isWebGL2);
             });
 
             it("fill polygon materials have expected glslVersion", () => {
                 const decodedTile: DecodedTile = getFillTile();
-                tgc.createObjects(newTile, decodedTile);
+                tgc.createObjects(newTile, decodedTile, textureCallback);
 
                 checkGlslVersion(newTile.objects, isWebGL2);
             });
 
             it("solid line materials have expected glslVersion", () => {
                 const decodedTile: DecodedTile = getSolidLineTile();
-                tgc.createObjects(newTile, decodedTile);
+                tgc.createObjects(newTile, decodedTile, textureCallback);
 
                 checkGlslVersion(newTile.objects, isWebGL2);
             });
@@ -279,7 +329,7 @@ describe("TileGeometryCreator", () => {
     describe("pickable geometry", () => {
         it("extruded polygon depth prepass and edges geometries are registered as non-pickable", () => {
             const decodedTile: DecodedTile = getExtrudedPolygonTile();
-            tgc.createObjects(newTile, decodedTile);
+            tgc.createObjects(newTile, decodedTile, textureCallback);
             assert.equal(newTile.objects.length, 3);
 
             newTile.objects.forEach(object => {
@@ -293,7 +343,7 @@ describe("TileGeometryCreator", () => {
 
         it("fill outline geometry is registered as pickable", () => {
             const decodedTile: DecodedTile = getFillTile();
-            tgc.createObjects(newTile, decodedTile);
+            tgc.createObjects(newTile, decodedTile, textureCallback);
             assert.equal(newTile.objects.length, 2);
             const adapter0 = MapObjectAdapter.get(newTile.objects[0]);
             expect(adapter0).not.equals(undefined);
@@ -306,7 +356,7 @@ describe("TileGeometryCreator", () => {
 
         it("solid line without outline is registered as pickable", () => {
             const decodedTile: DecodedTile = getSolidLineTile();
-            tgc.createObjects(newTile, decodedTile);
+            tgc.createObjects(newTile, decodedTile, textureCallback);
             assert.equal(newTile.objects.length, 1);
             const adapter = MapObjectAdapter.get(newTile.objects[0]);
             expect(adapter).not.equals(undefined);
@@ -334,7 +384,7 @@ describe("TileGeometryCreator", () => {
                     }
                 ]
             };
-            tgc.createObjects(newTile, decodedTile);
+            tgc.createObjects(newTile, decodedTile, textureCallback);
             assert.equal(newTile.objects.length, 2);
             const adapter0 = MapObjectAdapter.get(newTile.objects[0]);
             expect(adapter0).not.equals(undefined);
@@ -410,7 +460,7 @@ describe("TileGeometryCreator", () => {
         };
 
         tgc.initDecodedTile(decodedTile);
-        tgc.createObjects(newTile, decodedTile);
+        tgc.createObjects(newTile, decodedTile, textureCallback);
 
         // get the main object
         const mainObject = newTile.objects.find(o => o.uuid === geometry.uuid) as THREE.Mesh;
@@ -496,7 +546,7 @@ describe("TileGeometryCreator", () => {
                         } as any
                     ]
                 };
-                tgc.createObjects(newTile, decodedTile);
+                tgc.createObjects(newTile, decodedTile, textureCallback);
                 assert.equal(newTile.objects.length, 1);
                 const object = newTile.objects[0] as THREE.Mesh;
                 assert.isTrue(object.isMesh);
@@ -507,4 +557,61 @@ describe("TileGeometryCreator", () => {
             });
         });
     });
+
+    describe("createAllGeometries", function () {
+        const wait = (ms: number = 0) => new Promise(res => setTimeout(res, ms));
+        let initTexturesStub: sinon.SinonStub;
+        let initTextures: (() => void) | undefined;
+        let decodedTile: DecodedTile;
+        beforeEach(function () {
+            const promise = new Promise<void>(resolve => {
+                initTextures = resolve;
+            });
+            initTexturesStub = sandbox.stub().callsFake(async (texture: THREE.Texture) => {
+                await promise;
+                texture?.onUpdate();
+            });
+            (mapView.renderer as any).initTexture = initTexturesStub;
+            decodedTile = getTexturedTile();
+        });
+
+        it("uploads textures to GPU and adds them to owner tile", async function () {
+            let promiseResolved = false;
+            const texturesPromise = tgc.createAllGeometries(newTile, decodedTile).then(() => {
+                promiseResolved = true;
+            });
+
+            await wait();
+            assert.isFalse(promiseResolved);
+
+            initTextures!();
+            await assert.isFulfilled(texturesPromise);
+
+            assert.isTrue(promiseResolved);
+            assert.equal(newTile.objects.length, 1);
+            const material = (newTile.objects[0] as THREE.Mesh).material as any;
+            assert.isDefined(material.map);
+            assert.isTrue(newTile.shouldDisposeTexture(material.map as THREE.Texture));
+            assert.isDefined(material.alphaMap);
+            assert.isTrue(newTile.shouldDisposeTexture(material.alphaMap as THREE.Texture));
+            assert.isTrue(initTexturesStub.called);
+        });
+
+        it("ignores rejected textures and uploads all those resolved", async function () {
+            assert.lengthOf(decodedTile.techniques, 1);
+            // Force texture rejection by removing properties.
+            (decodedTile.techniques[0] as any).map.dataTextureProperties = undefined;
+            initTextures!();
+
+            await tgc.createAllGeometries(newTile, decodedTile);
+
+            assert.equal(newTile.objects.length, 1);
+            const material = (newTile.objects[0] as THREE.Mesh).material as any;
+            assert.isNull(material.map);
+            assert.isFalse(newTile.shouldDisposeTexture(material.map as THREE.Texture));
+            assert.isDefined(material.alphaMap);
+            assert.isTrue(newTile.shouldDisposeTexture(material.alphaMap as THREE.Texture));
+            assert.isTrue(initTexturesStub.called);
+        });
+    });
 });
diff --git a/@here/harp-mapview/test/VisibleTileSetTest.ts b/@here/harp-mapview/test/VisibleTileSetTest.ts
index 579c72e94e..8323cc3add 100644
--- a/@here/harp-mapview/test/VisibleTileSetTest.ts
+++ b/@here/harp-mapview/test/VisibleTileSetTest.ts
@@ -25,6 +25,7 @@ import { DataSource, DataSourceOptions } from "../lib/DataSource";
 import { FrustumIntersection, TileKeyEntry } from "../lib/FrustumIntersection";
 import { TileGeometryCreator } from "../lib/geometry/TileGeometryCreator";
 import { TileGeometryManager } from "../lib/geometry/TileGeometryManager";
+import { TileLoaderState } from "../lib/ITileLoader";
 import { MapView, TileTaskGroups } from "../lib/MapView";
 import { Tile } from "../lib/Tile";
 import { TileOffsetUtils } from "../lib/Utils";
@@ -430,6 +431,36 @@ describe("VisibleTileSet", function () {
         assert.equal(dataSourceTileList[0]?.visibleTiles[0].tileKey.mortonCode(), 1);
     });
 
+    it("#markTilesDirty cancels tileloader", async function () {
+        setupBerlinCenterCameraFromSamples();
+        const zoomLevel = 15;
+        const storageLevel = 14;
+        let dataSourceTileList = updateRenderList(zoomLevel, storageLevel).tileList;
+        let visibleTiles = dataSourceTileList[0].visibleTiles;
+
+        fixture.mapView.taskQueue.processNext(TileTaskGroups.FETCH_AND_DECODE, undefined, 2);
+        assert(visibleTiles.every(tile => tile.tileLoader?.state === TileLoaderState.Loading));
+
+        // See FakeTileLoader, this will take ~ 50ms.
+        await Promise.all(visibleTiles.map(tile => tile.tileLoader?.loadAndDecode()));
+
+        assert(visibleTiles.every(tile => tile.tileLoader?.state === TileLoaderState.Loaded));
+
+        // We need to reset the state.
+        fixture.vts.clearTileCache();
+        // Force the tiles to re-load.
+        dataSourceTileList = updateRenderList(zoomLevel, storageLevel).tileList;
+
+        visibleTiles = dataSourceTileList[0].visibleTiles;
+        assert(visibleTiles.every(tile => tile.tileLoader?.state === TileLoaderState.Loading));
+
+        // This is the crux of this test, we want to check that the loader state is cancelled.
+        fixture.vts.markTilesDirty();
+        assert(visibleTiles.every(tile => tile.tileLoader?.state === TileLoaderState.Canceled));
+        await Promise.all(visibleTiles.map(tile => tile.tileLoader?.loadAndDecode()));
+        assert(visibleTiles.every(tile => tile.tileLoader?.state === TileLoaderState.Loaded));
+    });
+
     it("#markTilesDirty properly handles cached & visible tiles", async function () {
         setupBerlinCenterCameraFromSamples();
         const zoomLevel = 15;
diff --git a/@here/harp-materials/package.json b/@here/harp-materials/package.json
index 4dab2d0413..89ff52e389 100644
--- a/@here/harp-materials/package.json
+++ b/@here/harp-materials/package.json
@@ -26,16 +26,16 @@
     "devDependencies": {
         "@types/chai": "^4.2.14",
         "@types/mocha": "^8.2.0",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "chai": "^4.0.2",
         "cross-env": "^7.0.2",
         "mocha": "^8.2.1",
         "source-map-support": "^0.5.19",
-        "three": "^0.127.0",
+        "three": "^0.129.0",
         "typescript": "^4.1.2"
     },
     "peerDependencies": {
-        "three": "^0.127.0"
+        "three": "^0.129.0"
     },
     "publishConfig": {
         "access": "public"
diff --git a/@here/harp-omv-datasource/package.json b/@here/harp-omv-datasource/package.json
index 6cac049bbb..5354e64bb0 100644
--- a/@here/harp-omv-datasource/package.json
+++ b/@here/harp-omv-datasource/package.json
@@ -38,7 +38,7 @@
         "@types/mocha": "^8.2.0",
         "@types/node": "^14.0.5",
         "@types/sinon": "^9.0.10",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "chai": "^4.0.2",
         "copyfiles": "^2.2.0",
         "cross-env": "^7.0.2",
@@ -48,7 +48,7 @@
         "typescript": "^4.1.2"
     },
     "peerDependencies": {
-        "three": "^0.127.0"
+        "three": "^0.129.0"
     },
     "publishConfig": {
         "access": "public"
diff --git a/@here/harp-test-utils/lib/WebGLStub.ts b/@here/harp-test-utils/lib/WebGLStub.ts
index 46fd340c4a..0e910e7fff 100644
--- a/@here/harp-test-utils/lib/WebGLStub.ts
+++ b/@here/harp-test-utils/lib/WebGLStub.ts
@@ -39,7 +39,7 @@ export function getWebGLRendererStub(sandbox: sinon.SinonSandbox, clearColorStub
         info: { autoReset: true, reset: () => undefined },
         debug: { checkShaderErrors: true },
         capabilities: { isWebGL2: false },
-        setOpaqueSort: (sort: any) => undefined,
+        setOpaqueSort: (a: any, b: any) => undefined,
         domElement: {
             addEventListener: () => {},
             removeEventListener: () => {}
diff --git a/@here/harp-test-utils/package.json b/@here/harp-test-utils/package.json
index 4286361ed9..6aaad44115 100644
--- a/@here/harp-test-utils/package.json
+++ b/@here/harp-test-utils/package.json
@@ -28,7 +28,7 @@
         "glob": "^7.1.3",
         "pixelmatch": "^5.2.0",
         "sinon": "^9.2.2",
-        "three": "^0.127.0",
+        "three": "^0.129.0",
         "ua-parser-js": "^0.7.21",
         "xml2js": "^0.4.23"
     },
@@ -42,7 +42,7 @@
         "@types/mocha": "^8.2.0",
         "@types/node": "^14.0.5",
         "@types/serve-static": "^1.13.4",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "body-parser": "^1.18.3",
         "cross-env": "^7.0.2",
         "express": "^4.17.1",
diff --git a/@here/harp-text-canvas/package.json b/@here/harp-text-canvas/package.json
index 16eab7477e..b2e9c13984 100644
--- a/@here/harp-text-canvas/package.json
+++ b/@here/harp-text-canvas/package.json
@@ -28,18 +28,18 @@
         "@types/chai": "^4.2.14",
         "@types/mocha": "^8.2.0",
         "@types/node": "^14.0.5",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "chai": "^4.0.2",
         "cross-env": "^7.0.2",
         "mocha": "^8.2.1",
         "sinon": "^9.2.2",
         "source-map-support": "^0.5.19",
-        "three": "^0.127.0",
+        "three": "^0.129.0",
         "ts-node": "^9.1.1",
         "typescript": "^4.1.2"
     },
     "peerDependencies": {
-        "three": "^0.127.0"
+        "three": "^0.129.0"
     },
     "publishConfig": {
         "access": "public"
diff --git a/@here/harp-vectortile-datasource/index-worker.ts b/@here/harp-vectortile-datasource/index-worker.ts
index e79982eb3f..8fdf2e40a7 100644
--- a/@here/harp-vectortile-datasource/index-worker.ts
+++ b/@here/harp-vectortile-datasource/index-worker.ts
@@ -7,3 +7,4 @@
 export * from "./lib/VectorTileDecoder";
 export * from "./lib/GeoJsonTilerService";
 export * from "./lib/OmvDecoderDefs";
+export * from "./lib/DataAdapter";
diff --git a/@here/harp-vectortile-datasource/lib/DataAdapter.ts b/@here/harp-vectortile-datasource/lib/DataAdapter.ts
index f523a452af..0d433b8623 100644
--- a/@here/harp-vectortile-datasource/lib/DataAdapter.ts
+++ b/@here/harp-vectortile-datasource/lib/DataAdapter.ts
@@ -5,17 +5,13 @@
  */
 
 import { DecodeInfo } from "./DecodeInfo";
+import { IGeometryProcessor } from "./IGeometryProcessor";
 
 /**
  * The class `DataAdapter` prepares vector data so it
  * can be processed by the vector tile decoder.
  */
 export interface DataAdapter {
-    /**
-     * `DataAdapter`'s id.
-     */
-    id: string;
-
     /**
      * Checks if the given data can be processed by this `DataAdapter`.
      *
@@ -28,6 +24,12 @@ export interface DataAdapter {
      *
      * @param data - The raw data to process.
      * @param decodeInfo - The `DecodeInfo` of the tile to process.
+     * @param geometryProcessor - Must be called for every feature providing its geometry
+     * (point,line or polygon) and properties. @see {@link IGeometryProcessor} for more details.
      */
-    process(data: ArrayBufferLike | {}, decodeInfo: DecodeInfo): void;
+    process(
+        data: ArrayBufferLike | {},
+        decodeInfo: DecodeInfo,
+        geometryProcessor: IGeometryProcessor
+    ): void;
 }
diff --git a/@here/harp-vectortile-datasource/lib/DecodeInfo.ts b/@here/harp-vectortile-datasource/lib/DecodeInfo.ts
index 4f41acaeac..9688ff810c 100644
--- a/@here/harp-vectortile-datasource/lib/DecodeInfo.ts
+++ b/@here/harp-vectortile-datasource/lib/DecodeInfo.ts
@@ -64,13 +64,11 @@ export class DecodeInfo {
     /**
      * Constructs a new [[DecodeInfo]].
      *
-     * @param adapterId - The id of the [[OmvDataAdapter]] used for decoding.
      * @param targetProjection - The [[Projection]]
      * @param tileKey - The [[TileKey]] of the Tile to decode.
      * @param storageLevelOffset - The storage level offset.
      */
     constructor(
-        readonly adapterId: string,
         readonly targetProjection: Projection,
         readonly tileKey: TileKey,
         readonly storageLevelOffset: number = 0
diff --git a/@here/harp-vectortile-datasource/lib/IGeometryProcessor.ts b/@here/harp-vectortile-datasource/lib/IGeometryProcessor.ts
index b64d3f5d9d..3faed3f0e0 100644
--- a/@here/harp-vectortile-datasource/lib/IGeometryProcessor.ts
+++ b/@here/harp-vectortile-datasource/lib/IGeometryProcessor.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { MapEnv } from "@here/harp-datasource-protocol/index-decoder";
+import { ValueMap } from "@here/harp-datasource-protocol/index-decoder";
 import { GeoCoordinates } from "@here/harp-geoutils";
 import { Vector2, Vector3 } from "three";
 
@@ -34,11 +34,10 @@ export interface ILineGeometry {
 }
 
 /**
- * The [[IGeometryProcessor]] is used to process geometry features encoded in OMV tiles.
+ * The [[IGeometryProcessor]] is used to process geometry features from vector tiles.
  *
- * [[OmvDecoder]] will pass to the processing methods of the concrete implementations
- * of this interface, sequences of geometries projected in the local space of the OMV
- * [[TilingScheme]] that is always defined to be an instance of [[webMercatorTilingScheme]].
+ * [[VectorTileDecoder]] will pass to this interface implementation sequences of geometries
+ * projected in webMercator local tile space (coordinates relative to tile's north-east corner).
  * If desired, the world positions can be converted to [[GeoCoordinates]] using the
  * [[Projection.unprojectPoint]], for example:
  *
@@ -54,68 +53,66 @@ export interface ILineGeometry {
  * ```
  *
  * The methods of concrete implementations of [[IGeometryProcessor]] are called to process point,
- * line and polygon geometries, see [[OmvDecoder]].
+ * line and polygon geometries, see [[VectorTileDecoder]].
  */
 export interface IGeometryProcessor {
-    /**
-     * The offset to apply the storage level of a tile to compute the zoom level.
-     */
-    storageLevelOffset?: number;
-
     /**
      * Process a sequence of point features.
      *
-     * The points are represented as local webMercator coordinates.
+     * The points are represented as local webMercator coordinates (coordinates relative to
+     * tile's north-east corner).
      *
      * @param layerName - The name of the enclosing layer.
-     * @param layerExtents - The extents of the enclosing layer.
+     * @param tileExtents - The tile size (north to south, east to west) in webMercator.
      * @param geometry - The positions of the point features in local webMercator coordinates.
-     * @param env - The environment containing the properties of the geometry.
-     * @param storageLevel - The storage level of the data.
+     * @param properties - The geometry properties.
+     * @param featureId - The feature identifier.
      */
     processPointFeature(
         layerName: string,
-        layerExtents: number,
+        tileExtents: number,
         geometry: Vector3[],
-        env: MapEnv,
-        storageLevel: number
+        properties: ValueMap,
+        featureId: string | number | undefined
     ): void;
 
     /**
      * Process a sequence of line features.
      *
-     * Each line is represented as an Array of local webMercator coordinates.
+     * Each line is represented as an Array of local webMercator coordinates (coordinates relative
+     * to tile's north-east corner).
      *
      * @param layerName - The name of the enclosing layer.
-     * @param layerExtents - The extents of the enclosing layer.
+     * @param tileExtents -The tile size (north to south, east to west) in webMercator.
      * @param geometry - The list of line geometries.
-     * @param env - The environment containing the properties of the geometry.
-     * @param storageLevel - The storage level of the data.
+     * @param properties - The geometry properties.
+     * @param featureId - The feature identifier.
      */
     processLineFeature(
         layerName: string,
-        layerExtents: number,
+        tileExtents: number,
         geometry: ILineGeometry[],
-        env: MapEnv,
-        storageLevel: number
+        properties: ValueMap,
+        featureId: string | number | undefined
     ): void;
 
     /**
      * Process a sequence of polygon features.
      *
-     * Each polygon is represented as an Array of contour representing exterior and interior rings.
+     * Each polygon is represented as an Array of contour representing exterior and interior rings
+     * in local webMercator coordinates  (coordinates relative to tile's north-east corner).
      *
      * @param layerName - The name of the enclosing layer.
-     * @param layerExtents - The extents of the enclosing layer.
-     * @param geometry - The list of polygons.
-     * @param env - The environment containing the properties of the geometry.
-     * @param storageLevel - The storage level of the data.
+     * @param tileExtents - The tile size (north to south, east to west) in webMercator.
+     * @param geometry - The list of polygons in local webMercator coordinates.
+     * @param properties - The geometry properties.
+     * @param featureId - The feature identifier.
      */
     processPolygonFeature(
         layerName: string,
-        layerExtents: number,
+        tileExtents: number,
         geometry: IPolygonGeometry[],
-        env: MapEnv,
-        storageLevel: number
+        properties: ValueMap,
+        featureId: string | number | undefined
     ): void;
 }
diff --git a/@here/harp-vectortile-datasource/lib/OmvDataFilter.ts b/@here/harp-vectortile-datasource/lib/OmvDataFilter.ts
index 54db1de0cc..e92711fc04 100644
--- a/@here/harp-vectortile-datasource/lib/OmvDataFilter.ts
+++ b/@here/harp-vectortile-datasource/lib/OmvDataFilter.ts
@@ -713,7 +713,7 @@ export class ComposedDataFilter implements OmvFeatureFilter {
      */
     get hasKindFilter() {
         return this.filters.reduce<boolean>(
-            (result, filter) => result && filter.hasKindFilter,
+            (result, filter) => result || filter.hasKindFilter,
             true
         );
     }
diff --git a/@here/harp-vectortile-datasource/lib/OmvDecoderDefs.ts b/@here/harp-vectortile-datasource/lib/OmvDecoderDefs.ts
index fad59dc98a..4395479d9b 100644
--- a/@here/harp-vectortile-datasource/lib/OmvDecoderDefs.ts
+++ b/@here/harp-vectortile-datasource/lib/OmvDecoderDefs.ts
@@ -141,7 +141,7 @@ export interface OmvFeatureFilterDescription {
 /**
  * Internal interface for options passed from the [[OmvDataSource]] to the decoder.
  *
- * @hidden
+ * @internal
  */
 export interface OmvDecoderOptions {
     /**
diff --git a/@here/harp-vectortile-datasource/lib/VectorTileDataEmitter.ts b/@here/harp-vectortile-datasource/lib/VectorTileDataEmitter.ts
index 068bf6ce13..3a2afe4da5 100644
--- a/@here/harp-vectortile-datasource/lib/VectorTileDataEmitter.ts
+++ b/@here/harp-vectortile-datasource/lib/VectorTileDataEmitter.ts
@@ -226,6 +226,17 @@ enum LineType {
 type TexCoordsFunction = (tilePos: THREE.Vector2, tileExtents: number) => THREE.Vector2;
 const tmpColor = new THREE.Color();
 
+/**
+ * Options for VectorTileDataEmitter, see {@link DecoderOptions} and {@link OmvDecoderOptions}.
+ * @internal
+ */
+export interface VectorTileDataEmitterOptions {
+    gatherFeatureAttributes?: boolean;
+    skipShortLabels?: boolean;
+    enableElevationOverlay?: boolean;
+    languages?: string[];
+}
+
 export class VectorTileDataEmitter {
     // mapping from style index to mesh buffers
     private readonly m_meshBuffers = new Map<number, MeshBuffers>();
@@ -245,11 +256,12 @@ export class VectorTileDataEmitter {
     constructor(
         private readonly m_decodeInfo: DecodeInfo,
         private readonly m_styleSetEvaluator: StyleSetEvaluator,
-        private readonly m_gatherFeatureAttributes: boolean,
-        private readonly m_skipShortLabels: boolean,
-        private readonly m_enableElevationOverlay: boolean,
-        private readonly m_languages?: string[]
-    ) {}
+        private readonly m_options: VectorTileDataEmitterOptions = {}
+    ) {
+        this.m_options.gatherFeatureAttributes = m_options.gatherFeatureAttributes ?? false;
+        this.m_options.skipShortLabels = m_options.skipShortLabels ?? true;
+        this.m_options.enableElevationOverlay = m_options.enableElevationOverlay ?? false;
+    }
 
     get projection() {
         return this.m_decodeInfo.targetProjection;
@@ -336,7 +348,7 @@ export class VectorTileDataEmitter {
             for (const pos of tilePositions) {
                 if (shouldCreateTextGeometries) {
                     const textTechnique = technique as TextTechnique;
-                    const text = getFeatureText(context, textTechnique, this.m_languages);
+                    const text = getFeatureText(context, textTechnique, this.m_options.languages);
 
                     if (text !== undefined && text.length > 0) {
                         texts.push(meshBuffers.addText(text));
@@ -365,7 +377,7 @@ export class VectorTileDataEmitter {
                     );
                 }
                 positions.push(tmpV3.x, tmpV3.y, tmpV3.z);
-                objInfos.push(this.m_gatherFeatureAttributes ? env.entries : featureId);
+                objInfos.push(this.m_options.gatherFeatureAttributes ? env.entries : featureId);
                 offsetDirections.push((env.lookup("offset_direction") as number) ?? 0);
 
                 if (wantsPoi) {
@@ -634,14 +646,14 @@ export class VectorTileDataEmitter {
                 isLineMarkerTechnique(technique)
             ) {
                 const textTechnique = technique as TextTechnique;
-                const text = getFeatureText(context, textTechnique, this.m_languages);
+                const text = getFeatureText(context, textTechnique, this.m_options.languages);
 
                 if (text === undefined || text.length === 0) {
                     continue;
                 }
                 let validLines: number[][] = [];
 
-                if (this.m_skipShortLabels) {
+                if (this.m_options.skipShortLabels) {
                     // Filter the lines, keep only those that are long enough for labelling. Also,
                     // split jagged label paths to keep processing and rendering only those that
                     // have no sharp corners, which would not be rendered anyway.
@@ -679,7 +691,7 @@ export class VectorTileDataEmitter {
                             path,
                             pathLengthSqr,
                             text: String(text),
-                            objInfos: this.m_gatherFeatureAttributes
+                            objInfos: this.m_options.gatherFeatureAttributes
                                 ? env.entries
                                 : getFeatureId(env.entries)
                         });
@@ -719,7 +731,7 @@ export class VectorTileDataEmitter {
                             texts: [0],
                             stringCatalog: [text, imageTexture],
                             imageTextures: [1],
-                            objInfos: this.m_gatherFeatureAttributes
+                            objInfos: this.m_options.gatherFeatureAttributes
                                 ? [env.entries]
                                 : [getFeatureId(env.entries)]
                         });
@@ -764,7 +776,9 @@ export class VectorTileDataEmitter {
                     triangulateLine(aLine, lineWidth, positions, indices, addCircle);
                     featureStarts.push(start);
                     objInfos.push(
-                        this.m_gatherFeatureAttributes ? env.entries : getFeatureId(env.entries)
+                        this.m_options.gatherFeatureAttributes
+                            ? env.entries
+                            : getFeatureId(env.entries)
                     );
                 });
 
@@ -1189,7 +1203,7 @@ export class VectorTileDataEmitter {
             (isFillTechnique(technique) ||
                 isSolidLineTechnique(technique) ||
                 isExtrudedPolygonTechnique(technique)) &&
-            this.m_enableElevationOverlay
+            this.m_options.enableElevationOverlay
         ) {
             return TextureCoordinateType.TileSpace;
         }
@@ -1265,7 +1279,7 @@ export class VectorTileDataEmitter {
                 lines: lineGroup
             };
 
-            if (this.m_gatherFeatureAttributes) {
+            if (this.m_options.gatherFeatureAttributes) {
                 aLine.objInfos = [featureAttributes];
                 aLine.featureStarts = [0];
             }
@@ -1275,7 +1289,7 @@ export class VectorTileDataEmitter {
             lineGroup = lineGroupGeometries.lines;
 
             if (
-                this.m_gatherFeatureAttributes &&
+                this.m_options.gatherFeatureAttributes &&
                 lineGroupGeometries.objInfos &&
                 lineGroupGeometries.featureStarts
             ) {
@@ -1615,7 +1629,7 @@ export class VectorTileDataEmitter {
                     if (texCoordType !== undefined) {
                         textureCoordinates.push(vertices[i + 2], vertices[i + 3]);
                     }
-                    if (this.m_enableElevationOverlay) {
+                    if (this.m_options.enableElevationOverlay) {
                         normals.push(...tempVertNormal.toArray());
                     }
                     if (isExtruded) {
@@ -1638,7 +1652,7 @@ export class VectorTileDataEmitter {
                         if (texCoordType !== undefined) {
                             textureCoordinates.push(vertices[i + 2], vertices[i + 3]);
                         }
-                        if (this.m_enableElevationOverlay) {
+                        if (this.m_options.enableElevationOverlay) {
                             normals.push(...tempVertNormal.toArray());
                         }
                         if (color !== undefined) {
@@ -1693,7 +1707,7 @@ export class VectorTileDataEmitter {
                 logger.error(`cannot triangulate geometry`, err);
             }
 
-            if (this.m_gatherFeatureAttributes) {
+            if (this.m_options.gatherFeatureAttributes) {
                 meshBuffers.objInfos.push(context.env.entries);
                 meshBuffers.featureStarts.push(startIndexCount);
                 meshBuffers.edgeFeatureStarts.push(edgeStartIndexCount);
diff --git a/@here/harp-vectortile-datasource/lib/VectorTileDecoder.ts b/@here/harp-vectortile-datasource/lib/VectorTileDecoder.ts
index 4b583fae8f..332df1de2c 100644
--- a/@here/harp-vectortile-datasource/lib/VectorTileDecoder.ts
+++ b/@here/harp-vectortile-datasource/lib/VectorTileDecoder.ts
@@ -8,7 +8,8 @@ import {
     DecoderOptions,
     GeometryKind,
     IndexedTechnique,
-    OptionsMap
+    OptionsMap,
+    ValueMap
 } from "@here/harp-datasource-protocol";
 import { MapEnv, StyleSetEvaluator } from "@here/harp-datasource-protocol/index-decoder";
 import { AttrEvaluationContext } from "@here/harp-datasource-protocol/lib/TechniqueAttr";
@@ -27,105 +28,62 @@ import { OmvDataAdapter } from "./adapters/omv/OmvDataAdapter";
 import { DataAdapter } from "./DataAdapter";
 import { DecodeInfo } from "./DecodeInfo";
 import { IGeometryProcessor, ILineGeometry, IPolygonGeometry } from "./IGeometryProcessor";
-import {
-    ComposedDataFilter,
-    OmvFeatureFilter,
-    OmvFeatureModifier,
-    OmvGenericFeatureFilter,
-    OmvGenericFeatureModifier
-} from "./OmvDataFilter";
-import {
-    FeatureModifierId,
-    OmvDecoderOptions,
-    OmvFeatureFilterDescription,
-    VECTOR_TILE_DECODER_SERVICE_TYPE
-} from "./OmvDecoderDefs";
-import { OmvPoliticalViewFeatureModifier } from "./OmvPoliticalViewFeatureModifier";
-import { StyleSetDataFilter } from "./StyleSetDataFilter";
-import { VectorTileDataEmitter } from "./VectorTileDataEmitter";
+import { OmvFeatureFilter } from "./OmvDataFilter";
+import { OmvDecoderOptions, VECTOR_TILE_DECODER_SERVICE_TYPE } from "./OmvDecoderDefs";
+import { VectorTileDataEmitter, VectorTileDataEmitterOptions } from "./VectorTileDataEmitter";
 
 const logger = LoggerManager.instance.create("VectorTileDecoder", { enabled: false });
 
+/**
+ * Options for VectorTileDataProcessor, @see {@link OmvDecoderOptions}.
+ * @internal
+ */
+export interface VectorTileDataProcessorOptions extends VectorTileDataEmitterOptions {
+    storageLevelOffset?: number;
+    showMissingTechniques?: boolean;
+}
+
+/**
+ * Geometry processor for vector tiles.
+ * @internal
+ */
 export class VectorTileDataProcessor implements IGeometryProcessor {
-    // The emitter is optional now.
-    // TODO: Add option to control emitter generation.
     private m_decodedTileEmitter: VectorTileDataEmitter | undefined;
-    private readonly m_dataAdapters: DataAdapter[] = [];
 
     constructor(
+        private readonly m_tileKey: TileKey,
         private readonly m_projection: Projection,
         private readonly m_styleSetEvaluator: StyleSetEvaluator,
-        private readonly m_showMissingTechniques: boolean,
-        private readonly m_dataFilter?: OmvFeatureFilter,
-        private readonly m_featureModifiers?: OmvFeatureModifier[],
-        private readonly m_gatherFeatureAttributes = false,
-        private readonly m_skipShortLabels = true,
-        private readonly m_storageLevelOffset = 0,
-        private readonly m_enableElevationOverlay = false,
-        private readonly m_roundUpCoordinatesIfNeeded = false,
-        private readonly m_languages?: string[]
+        private readonly m_dataAdapter: DataAdapter,
+        private readonly m_options: VectorTileDataProcessorOptions = {},
+        private readonly m_dataFilter?: OmvFeatureFilter
     ) {
-        const styleSetDataFilter = new StyleSetDataFilter(m_styleSetEvaluator);
-        const dataPreFilter = m_dataFilter
-            ? new ComposedDataFilter([styleSetDataFilter, m_dataFilter])
-            : styleSetDataFilter;
-
-        // Register the default adapters.
-
-        const omvDataAdapter = new OmvDataAdapter(this, dataPreFilter, logger);
-        omvDataAdapter.roundUpCoordinatesIfNeeded = m_roundUpCoordinatesIfNeeded;
-        this.m_dataAdapters.push(omvDataAdapter);
-
-        this.m_dataAdapters.push(new GeoJsonVtDataAdapter(this, dataPreFilter, logger));
-        this.m_dataAdapters.push(new GeoJsonDataAdapter(this, dataPreFilter, logger));
-    }
-
-    get storageLevelOffset() {
-        return this.m_storageLevelOffset;
+        m_options.storageLevelOffset = m_options.storageLevelOffset ?? 0;
+        m_options.showMissingTechniques = m_options.showMissingTechniques ?? false;
     }
 
     /**
-     * Given a tile and a protobuffer, it returns a decoded tile and it creates the geometries that
-     * belong to it.
+     * Decodes the given tile data.
      *
-     * @param tileKey - The tile to be decoded.
-     * @param data - The protobuffer to decode from.
+     * @param data - The tile data to decode.
      * @returns A [[DecodedTile]]
      */
-    getDecodedTile(tileKey: TileKey, data: ArrayBufferLike | {}): DecodedTile {
-        let dataAdapter;
-        for (const adapter of this.m_dataAdapters.values()) {
-            if (adapter.canProcess(data)) {
-                dataAdapter = adapter;
-                break;
-            }
-        }
-        if (dataAdapter === undefined) {
-            return {
-                techniques: [],
-                geometries: []
-            };
-        }
-
+    getDecodedTile(data: ArrayBufferLike | {}): DecodedTile {
         this.m_styleSetEvaluator.resetTechniques();
 
         const decodeInfo = new DecodeInfo(
-            dataAdapter.id,
             this.m_projection,
-            tileKey,
-            this.m_storageLevelOffset
+            this.m_tileKey,
+            this.m_options.storageLevelOffset!
         );
 
         this.m_decodedTileEmitter = new VectorTileDataEmitter(
             decodeInfo,
             this.m_styleSetEvaluator,
-            this.m_gatherFeatureAttributes,
-            this.m_skipShortLabels,
-            this.m_enableElevationOverlay,
-            this.m_languages
+            this.m_options
         );
 
-        dataAdapter.process(data, decodeInfo);
+        this.m_dataAdapter.process(data, decodeInfo, this);
         return this.m_decodedTileEmitter.getDecodedTile();
     }
 
@@ -134,49 +92,20 @@ export class VectorTileDataProcessor implements IGeometryProcessor {
         layer: string,
         extents: number,
         geometry: THREE.Vector3[],
-        env: MapEnv,
-        storageLevel: number
+        properties: ValueMap,
+        featureId: string | number | undefined
     ): void {
-        if (this.m_featureModifiers !== undefined) {
-            if (
-                this.m_featureModifiers.find(fm => {
-                    // TODO: The logic of feature ignore should be actually in the feature filtering
-                    // mechanism - see OmvFeatureFilter.
-                    return !fm.doProcessPointFeature(layer, env, storageLevel);
-                }) !== undefined
-            ) {
-                return;
-            }
-        }
-
-        const techniques = this.applyKindFilter(
-            this.m_styleSetEvaluator.getMatchingTechniques(env, layer, "point"),
+        assert(this.m_decodedTileEmitter !== undefined);
+        this.processFeature(
+            layer,
+            extents,
+            geometry,
+            "point",
+            properties,
+            featureId,
+            this.m_decodedTileEmitter!.processPointFeature,
             GeometryKind.Label
         );
-
-        if (techniques.length === 0) {
-            if (this.m_showMissingTechniques) {
-                logger.log(
-                    "OmvDecoder#processPointFeature: no techniques for object:",
-                    JSON.stringify(env.unmap())
-                );
-            }
-            return;
-        }
-        const context: AttrEvaluationContext = {
-            env,
-            cachedExprResults: new Map()
-        };
-
-        if (this.m_decodedTileEmitter) {
-            this.m_decodedTileEmitter.processPointFeature(
-                layer,
-                extents,
-                geometry,
-                context,
-                techniques
-            );
-        }
     }
 
     /** @override */
@@ -184,48 +113,20 @@ export class VectorTileDataProcessor implements IGeometryProcessor {
         layer: string,
         extents: number,
         geometry: ILineGeometry[],
-        env: MapEnv,
-        storageLevel: number
+        properties: ValueMap,
+        featureId: string | number | undefined
     ): void {
-        if (this.m_featureModifiers !== undefined) {
-            if (
-                this.m_featureModifiers.find(fm => {
-                    return !fm.doProcessLineFeature(layer, env, storageLevel);
-                }) !== undefined
-            ) {
-                return;
-            }
-        }
-
-        const techniques = this.applyKindFilter(
-            this.m_styleSetEvaluator.getMatchingTechniques(env, layer, "line"),
+        assert(this.m_decodedTileEmitter !== undefined);
+        this.processFeature(
+            layer,
+            extents,
+            geometry,
+            "line",
+            properties,
+            featureId,
+            this.m_decodedTileEmitter!.processLineFeature,
             GeometryKind.Line
         );
-
-        if (techniques.length === 0) {
-            if (this.m_showMissingTechniques) {
-                logger.log(
-                    "OmvDecoder#processLineFeature: no techniques for object:",
-                    JSON.stringify(env.unmap())
-                );
-            }
-            return;
-        }
-
-        const context: AttrEvaluationContext = {
-            env,
-            cachedExprResults: new Map()
-        };
-
-        if (this.m_decodedTileEmitter) {
-            this.m_decodedTileEmitter.processLineFeature(
-                layer,
-                extents,
-                geometry,
-                context,
-                techniques
-            );
-        }
     }
 
     /** @override */
@@ -233,50 +134,80 @@ export class VectorTileDataProcessor implements IGeometryProcessor {
         layer: string,
         extents: number,
         geometry: IPolygonGeometry[],
-        env: MapEnv,
-        storageLevel: number
+        properties: ValueMap,
+        featureId: string | number | undefined
     ): void {
-        if (this.m_featureModifiers !== undefined) {
-            if (
-                this.m_featureModifiers.find(fm => {
-                    return !fm.doProcessPolygonFeature(layer, env, storageLevel);
-                }) !== undefined
-            ) {
-                return;
-            }
-        }
+        assert(this.m_decodedTileEmitter !== undefined);
+        this.processFeature(
+            layer,
+            extents,
+            geometry,
+            "polygon",
+            properties,
+            featureId,
+            this.m_decodedTileEmitter!.processPolygonFeature,
+            GeometryKind.Area
+        );
+    }
 
+    private processFeature(
+        layer: string,
+        extents: number,
+        geometry: THREE.Vector3[] | ILineGeometry[] | IPolygonGeometry[],
+        geometryType: string,
+        properties: ValueMap,
+        featureId: string | number | undefined,
+        emitterFunc: (...args: any[]) => void,
+        geometryKind: GeometryKind
+    ) {
+        const env = this.createMapEnv(properties, featureId, layer, geometryType);
         const techniques = this.applyKindFilter(
-            this.m_styleSetEvaluator.getMatchingTechniques(env, layer, "polygon"),
-            GeometryKind.Area
+            this.m_styleSetEvaluator.getMatchingTechniques(env, layer, geometryType),
+            geometryKind
         );
 
         if (techniques.length === 0) {
-            if (this.m_showMissingTechniques) {
+            if (this.m_options.showMissingTechniques) {
                 logger.log(
-                    "OmvDecoder#processPolygonFeature: no techniques for object:",
+                    "VectorTileDataProcessor#processFeature: no techniques for object:",
                     JSON.stringify(env.unmap())
                 );
             }
             return;
         }
-
-        const context = {
+        const context: AttrEvaluationContext = {
             env,
             cachedExprResults: new Map()
         };
 
         if (this.m_decodedTileEmitter) {
-            this.m_decodedTileEmitter.processPolygonFeature(
+            emitterFunc.apply(this.m_decodedTileEmitter, [
                 layer,
                 extents,
                 geometry,
                 context,
                 techniques
-            );
+            ]);
         }
     }
 
+    private createMapEnv(
+        properties: ValueMap,
+        featureId: string | number | undefined,
+        layer: string,
+        geometryType: string
+    ): MapEnv {
+        const level = this.m_tileKey.level;
+        return new MapEnv({
+            $layer: layer,
+            $id: featureId ?? null,
+            $level: level,
+            $zoom: Math.max(0, level - this.m_options.storageLevelOffset!),
+            $geometryType: geometryType,
+            ...properties
+        });
+    }
+
     private applyKindFilter(
         techniques: IndexedTechnique[],
         defaultKind: GeometryKind
@@ -296,13 +227,20 @@ export class VectorTileDataProcessor implements IGeometryProcessor {
  * The vector tile decoder.
  */
 export class VectorTileDecoder extends ThemedTileDecoder {
-    private m_showMissingTechniques: boolean = false;
     private m_featureFilter?: OmvFeatureFilter;
-    private m_featureModifiers?: OmvFeatureModifier[];
-    private m_gatherFeatureAttributes: boolean = false;
-    private m_skipShortLabels: boolean = true;
-    private m_enableElevationOverlay: boolean = false;
-    private m_roundUpCoordinatesIfNeeded: boolean = false;
+    private readonly m_roundUpCoordinatesIfNeeded: boolean = false;
+    private m_dataAdapter?: DataAdapter;
+    private m_options: { map: OptionsMap; changed: boolean } = { map: {}, changed: false };
+    private readonly m_defaultDataAdapters: DataAdapter[] = [];
+
+    constructor() {
+        super();
+        this.m_defaultDataAdapters.push(
+            new OmvDataAdapter(),
+            new GeoJsonVtDataAdapter(),
+            new GeoJsonDataAdapter()
+        );
+    }
 
     /** @override */
     connect(): Promise<void> {
@@ -311,28 +249,38 @@ export class VectorTileDecoder extends ThemedTileDecoder {
 
     /** @override */
     decodeThemedTile(
-        data: ArrayBufferLike,
+        data: ArrayBufferLike | {},
         tileKey: TileKey,
         styleSetEvaluator: StyleSetEvaluator,
         projection: Projection
     ): Promise<DecodedTile> {
         const startTime = PerformanceTimer.now();
+        if (!this.m_dataAdapter) {
+            this.m_dataAdapter = this.getDataAdapter(data);
+            if (!this.m_dataAdapter) {
+                return Promise.reject(new Error("Unsupported data format."));
+            }
+        }
+        const dataAdapter = this.m_dataAdapter!;
+        assert(dataAdapter.canProcess(data));
+        if (this.m_options.changed) {
+            if (dataAdapter instanceof OmvDataAdapter) {
+                const omvOptions = this.m_options.map as OmvDecoderOptions;
+                dataAdapter.configure(omvOptions, styleSetEvaluator);
+                this.m_featureFilter = dataAdapter.dataFilter;
+            }
+            this.m_options.changed = false;
+        }
 
         const decoder = new VectorTileDataProcessor(
+            tileKey,
             projection,
             styleSetEvaluator,
-            this.m_showMissingTechniques,
-            this.m_featureFilter,
-            this.m_featureModifiers,
-            this.m_gatherFeatureAttributes,
-            this.m_skipShortLabels,
-            this.m_storageLevelOffset,
-            this.m_enableElevationOverlay,
-            this.m_roundUpCoordinatesIfNeeded,
-            this.languages
+            dataAdapter,
+            this.m_options.map as VectorTileDataProcessorOptions,
+            this.m_featureFilter
         );
-
-        const decodedTile = decoder.getDecodedTile(tileKey, data);
+        const decodedTile = decoder.getDecodedTile(data);
 
         decodedTile.decodeTime = PerformanceTimer.now() - startTime;
 
@@ -342,102 +290,31 @@ export class VectorTileDecoder extends ThemedTileDecoder {
     /** @override */
     configure(options?: DecoderOptions, customOptions?: OptionsMap): void {
         super.configure(options, customOptions);
-
-        if (customOptions) {
-            const omvOptions = customOptions as OmvDecoderOptions;
-
-            if (omvOptions.showMissingTechniques !== undefined) {
-                this.m_showMissingTechniques = omvOptions.showMissingTechniques === true;
-            }
-
-            if (omvOptions.filterDescription !== undefined) {
-                if (omvOptions.filterDescription !== null) {
-                    // TODO: Feature modifier is always used only with feature filter.
-                    // At best the filtering feature should be excluded from other feature
-                    // modifiers and be performed solely via OmvGenericFeature modifier or filter.
-                    const filterDescription = omvOptions.filterDescription;
-                    const featureModifiersIds = omvOptions.featureModifiers;
-
-                    // Create new filter from description.
-                    this.m_featureFilter = new OmvGenericFeatureFilter(filterDescription);
-                    // Create feature modifiers.
-                    const featureModifiers: OmvFeatureModifier[] = [];
-                    if (featureModifiersIds !== undefined) {
-                        featureModifiersIds.forEach(fmId => {
-                            featureModifiers.push(
-                                this.createFeatureModifier(filterDescription, fmId)
-                            );
-                        });
-                    } else {
-                        featureModifiers.push(
-                            this.createFeatureModifier(filterDescription, FeatureModifierId.default)
-                        );
-                    }
-                    this.m_featureModifiers = featureModifiers;
-                } else {
-                    // null is the signal to clear the filter/modifier
-                    this.m_featureFilter = undefined;
-                    this.m_featureModifiers = undefined;
-                }
-            }
-
-            if (omvOptions.politicalView !== undefined) {
-                const politicalView = omvOptions.politicalView;
-                let featureModifiers = this.m_featureModifiers;
-                // Remove existing political view modifiers, this actually setups default,
-                // commonly accepted point of view - without feature modifier.
-                if (featureModifiers) {
-                    featureModifiers = featureModifiers.filter(
-                        fm => !(fm instanceof OmvPoliticalViewFeatureModifier)
-                    );
-                }
-                // If political view is indeed requested append feature modifier at the end of list.
-                if (politicalView.length !== 0) {
-                    assert(
-                        politicalView.length === 2,
-                        "The political view must be specified as two letters ISO 3166-1 standard!"
-                    );
-                    const povFeatureModifier = new OmvPoliticalViewFeatureModifier(politicalView);
-                    if (featureModifiers) {
-                        featureModifiers.push(povFeatureModifier);
-                    } else {
-                        featureModifiers = [povFeatureModifier];
-                    }
-                }
-                // Reset modifiers if nothing was added.
-                this.m_featureModifiers =
-                    featureModifiers && featureModifiers.length > 0 ? featureModifiers : undefined;
-            }
-
-            if (omvOptions.gatherFeatureAttributes !== undefined) {
-                this.m_gatherFeatureAttributes = omvOptions.gatherFeatureAttributes === true;
-            }
-            if (omvOptions.skipShortLabels !== undefined) {
-                this.m_skipShortLabels = omvOptions.skipShortLabels;
-            }
-            if (omvOptions.enableElevationOverlay !== undefined) {
-                this.m_enableElevationOverlay = omvOptions.enableElevationOverlay;
-            }
-            if (omvOptions.roundUpCoordinatesIfNeeded !== undefined) {
-                this.m_roundUpCoordinatesIfNeeded = omvOptions.roundUpCoordinatesIfNeeded;
-            }
-        }
-        if (options?.languages !== undefined) {
-            this.languages = options.languages;
-        }
+        this.m_options.map = {
+            ...this.m_options.map,
+            ...options,
+            ...customOptions
+        };
+        this.m_options.changed = true;
     }
 
-    private createFeatureModifier(
-        filterDescription: OmvFeatureFilterDescription,
-        featureModifierId?: FeatureModifierId
-    ): OmvFeatureModifier {
-        switch (featureModifierId) {
-            case FeatureModifierId.default:
-                return new OmvGenericFeatureModifier(filterDescription);
-            default:
-                assert(!"Unrecognized feature modifier id, using default!");
-                return new OmvGenericFeatureModifier(filterDescription);
+    /**
+     * Returns the appropiate data adapter to convert the given data into the format expected by
+     * VectorTileDecoder.
+     * @note Default adapters are available for GeoJson and OMV formats.
+     * Child classes may override this function to support additional formats.
+     *
+     * @param data - The input data to be coverted.
+     * @returns The DataAdapter to convert the data, or undefined if there's no adapter for that
+     * data format.
+     */
+    protected getDataAdapter(data: ArrayBufferLike | {}): DataAdapter | undefined {
+        for (const adapter of this.m_defaultDataAdapters) {
+            if (adapter.canProcess(data)) {
+                return adapter;
+            }
         }
+        return undefined;
     }
 }
 
diff --git a/@here/harp-vectortile-datasource/lib/adapters/geojson-vt/GeoJsonVtDataAdapter.ts b/@here/harp-vectortile-datasource/lib/adapters/geojson-vt/GeoJsonVtDataAdapter.ts
index b67d768f8e..96f0566adf 100644
--- a/@here/harp-vectortile-datasource/lib/adapters/geojson-vt/GeoJsonVtDataAdapter.ts
+++ b/@here/harp-vectortile-datasource/lib/adapters/geojson-vt/GeoJsonVtDataAdapter.ts
@@ -4,15 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { MapEnv, ValueMap } from "@here/harp-datasource-protocol/index-decoder";
+import { ValueMap } from "@here/harp-datasource-protocol/index-decoder";
 import { webMercatorProjection } from "@here/harp-geoutils";
-import { ILogger } from "@here/harp-utils";
 import { ShapeUtils, Vector2, Vector3 } from "three";
 
 import { DataAdapter } from "../../DataAdapter";
 import { DecodeInfo } from "../../DecodeInfo";
 import { IGeometryProcessor, ILineGeometry, IPolygonGeometry } from "../../IGeometryProcessor";
-import { OmvFeatureFilter } from "../../OmvDataFilter";
 import { isArrayBufferLike, tile2world } from "../../OmvUtils";
 
 const VT_JSON_EXTENTS = 4096;
@@ -64,32 +62,14 @@ interface VTJsonTileInterface {
 
 const worldPos = new Vector3();
 
-/**
- * Unique ID of {@link VTJsonDataAdapter}.
- */
-export const VTJsonDataAdapterId: string = "vt-json";
-
 /**
  * The class `GeoJsonVtDataAdapter` converts VT-json data to geometries for the given
  * {@link IGeometryProcessor}.
  */
 export class GeoJsonVtDataAdapter implements DataAdapter {
-    id = VTJsonDataAdapterId;
-
-    constructor(
-        readonly m_processor: IGeometryProcessor,
-        private m_dataFilter?: OmvFeatureFilter,
-        readonly m_logger?: ILogger
-    ) {}
-
-    get dataFilter(): OmvFeatureFilter | undefined {
-        return this.m_dataFilter;
-    }
-
-    set dataFilter(dataFilter: OmvFeatureFilter | undefined) {
-        this.m_dataFilter = dataFilter;
-    }
-
+    /**
+     * @override
+     */
     canProcess(data: ArrayBufferLike | {}): boolean {
         if (isArrayBufferLike(data)) {
             return false;
@@ -109,18 +89,15 @@ export class GeoJsonVtDataAdapter implements DataAdapter {
         return true;
     }
 
-    process(tile: VTJsonTileInterface, decodeInfo: DecodeInfo) {
-        const { tileKey } = decodeInfo;
+    /**
+     * @override
+     */
+    process(
+        tile: VTJsonTileInterface,
+        decodeInfo: DecodeInfo,
+        geometryProcessor: IGeometryProcessor
+    ) {
         for (const feature of tile.features) {
-            const env = new MapEnv({
-                $layer: tile.layer,
-                $geometryType: this.convertGeometryType(feature.type),
-                $level: tileKey.level,
-                $zoom: Math.max(0, tileKey.level - (this.m_processor.storageLevelOffset ?? 0)),
-                $id: feature.id,
-                ...feature.tags
-            });
-
             switch (feature.type) {
                 case VTJsonGeometryType.Point: {
                     for (const pointGeometry of feature.geometry) {
@@ -129,12 +106,12 @@ export class GeoJsonVtDataAdapter implements DataAdapter {
 
                         const position = new Vector3(x, y, 0);
 
-                        this.m_processor.processPointFeature(
+                        geometryProcessor.processPointFeature(
                             tile.layer,
                             VT_JSON_EXTENTS,
                             [position],
-                            env,
-                            tileKey.level
+                            feature.tags,
+                            feature.id
                         );
                     }
                     break;
@@ -170,12 +147,12 @@ export class GeoJsonVtDataAdapter implements DataAdapter {
                         });
                     });
 
-                    this.m_processor.processLineFeature(
+                    geometryProcessor.processLineFeature(
                         tile.layer,
                         VT_JSON_EXTENTS,
                         lines,
-                        env,
-                        tileKey.level
+                        feature.tags,
+                        feature.id
                     );
 
                     break;
@@ -200,12 +177,12 @@ export class GeoJsonVtDataAdapter implements DataAdapter {
                         polygon?.rings.push(ring);
                     }
 
-                    this.m_processor.processPolygonFeature(
+                    geometryProcessor.processPolygonFeature(
                         tile.layer,
                         VT_JSON_EXTENTS,
                         polygons,
-                        env,
-                        tileKey.level
+                        feature.tags,
+                        feature.id
                     );
 
                     break;
@@ -216,17 +193,4 @@ export class GeoJsonVtDataAdapter implements DataAdapter {
             }
         }
     }
-
-    private convertGeometryType(type: VTJsonGeometryType): string {
-        switch (type) {
-            case VTJsonGeometryType.Point:
-                return "point";
-            case VTJsonGeometryType.LineString:
-                return "line";
-            case VTJsonGeometryType.Polygon:
-                return "polygon";
-            default:
-                return "unknown";
-        }
-    }
 }
diff --git a/@here/harp-vectortile-datasource/lib/adapters/geojson/GeoJsonDataAdapter.ts b/@here/harp-vectortile-datasource/lib/adapters/geojson/GeoJsonDataAdapter.ts
index 7dfc358b52..d3c06b36de 100644
--- a/@here/harp-vectortile-datasource/lib/adapters/geojson/GeoJsonDataAdapter.ts
+++ b/@here/harp-vectortile-datasource/lib/adapters/geojson/GeoJsonDataAdapter.ts
@@ -4,17 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { MapEnv, ValueMap } from "@here/harp-datasource-protocol/lib/Env";
+import { ValueMap } from "@here/harp-datasource-protocol/lib/Env";
 import { clipLineString } from "@here/harp-geometry/lib/ClipLineString";
 import { GeoCoordinates, GeoPointLike, webMercatorProjection } from "@here/harp-geoutils";
 import { Vector2Like } from "@here/harp-geoutils/lib/math/Vector2Like";
-import { ILogger } from "@here/harp-utils";
 import { ShapeUtils, Vector2, Vector3 } from "three";
 
 import { DataAdapter } from "../../DataAdapter";
 import { DecodeInfo } from "../../DecodeInfo";
 import { IGeometryProcessor, ILineGeometry, IPolygonGeometry } from "../../IGeometryProcessor";
-import { OmvFeatureFilter } from "../../OmvDataFilter";
 import { world2tile } from "../../OmvUtils";
 
 const DEFAULT_EXTENTS = 4 * 1024;
@@ -59,34 +57,16 @@ interface GeoJsonMultiPolygonGeometry {
 
 interface GeoJsonFeature {
     id?: string;
+    type: "Feature";
     properties: ValueMap;
     geometry: GeoJsonGeometry;
 }
 
-interface GeoJsonFeatureCollection {
+export interface GeoJsonFeatureCollection {
     type: "FeatureCollection";
     features: GeoJsonFeature[];
 }
 
-function convertGeometryType(type: string): string {
-    switch (type) {
-        case "LineString":
-            return "line";
-        case "MultiLineString":
-            return "line";
-        case "Polygon":
-            return "polygon";
-        case "MultiPolygon":
-            return "polygon";
-        case "Point":
-            return "point";
-        case "MultiPoint":
-            return "point";
-        default:
-            return "unknown";
-    } // switch
-}
-
 const worldP = new Vector3();
 
 /**
@@ -170,14 +150,9 @@ function convertPointGeometry(
 }
 
 export class GeoJsonDataAdapter implements DataAdapter {
-    id = "GeoJsonDataAdapter";
-
-    constructor(
-        readonly m_processor: IGeometryProcessor,
-        readonly dataFilter: OmvFeatureFilter,
-        readonly m_logger?: ILogger
-    ) {}
-
+    /**
+     * @override
+     */
     canProcess(featureCollection: Partial<GeoJsonFeatureCollection>): boolean {
         return (
             featureCollection &&
@@ -186,28 +161,18 @@ export class GeoJsonDataAdapter implements DataAdapter {
         );
     }
 
-    process(featureCollection: GeoJsonFeatureCollection, decodeInfo: DecodeInfo): void {
+    /** @override */
+    process(
+        featureCollection: GeoJsonFeatureCollection,
+        decodeInfo: DecodeInfo,
+        geometryProcessor: IGeometryProcessor,
+        layer: string = "geojson"
+    ): void {
         if (!Array.isArray(featureCollection.features) || featureCollection.features.length === 0) {
             return;
         }
 
-        const { tileKey } = decodeInfo;
-
-        const $level = tileKey.level;
-        const $zoom = Math.max(0, tileKey.level - (this.m_processor.storageLevelOffset ?? 0));
-        const $layer = "geojson";
-
         for (const feature of featureCollection.features) {
-            const $geometryType = convertGeometryType(feature.geometry.type);
-            const env = new MapEnv({
-                ...feature.properties,
-                $id: feature.id ?? null,
-                $layer,
-                $level,
-                $zoom,
-                $geometryType
-            });
-
             switch (feature.geometry.type) {
                 case "LineString":
                 case "MultiLineString": {
@@ -233,12 +198,12 @@ export class GeoJsonDataAdapter implements DataAdapter {
                     geometry = clippedGeometries;
 
                     if (geometry.length > 0) {
-                        this.m_processor.processLineFeature(
-                            $layer,
+                        geometryProcessor.processLineFeature(
+                            layer,
                             DEFAULT_EXTENTS,
                             clippedGeometries,
-                            env,
-                            $level
+                            feature.properties,
+                            feature.id
                         );
                     }
                     break;
@@ -246,24 +211,24 @@ export class GeoJsonDataAdapter implements DataAdapter {
                 case "Polygon":
                 case "MultiPolygon": {
                     const geometry = convertPolygonGeometry(feature.geometry, decodeInfo);
-                    this.m_processor.processPolygonFeature(
-                        $layer,
+                    geometryProcessor.processPolygonFeature(
+                        layer,
                         DEFAULT_EXTENTS,
                         geometry,
-                        env,
-                        $level
+                        feature.properties,
+                        feature.id
                     );
                     break;
                 }
                 case "Point":
                 case "MultiPoint": {
                     const geometry = convertPointGeometry(feature.geometry, decodeInfo);
-                    this.m_processor.processPointFeature(
-                        $layer,
+                    geometryProcessor.processPointFeature(
+                        layer,
                         DEFAULT_EXTENTS,
                         geometry,
-                        env,
-                        $level
+                        feature.properties,
+                        feature.id
                     );
                     break;
                 }
diff --git a/@here/harp-vectortile-datasource/lib/adapters/omv/OmvDataAdapter.ts b/@here/harp-vectortile-datasource/lib/adapters/omv/OmvDataAdapter.ts
index 3c7a24a22b..f225fd98c8 100644
--- a/@here/harp-vectortile-datasource/lib/adapters/omv/OmvDataAdapter.ts
+++ b/@here/harp-vectortile-datasource/lib/adapters/omv/OmvDataAdapter.ts
@@ -4,18 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Env, MapEnv, Value, ValueMap } from "@here/harp-datasource-protocol/index-decoder";
+import {
+    MapEnv,
+    StyleSetEvaluator,
+    Value,
+    ValueMap
+} from "@here/harp-datasource-protocol/index-decoder";
 import { TileKey } from "@here/harp-geoutils";
-import { ILogger } from "@here/harp-utils";
+import { assert, ILogger, LoggerManager } from "@here/harp-utils";
 import * as Long from "long";
 import { ShapeUtils, Vector2, Vector3 } from "three";
 
 import { DataAdapter } from "../../DataAdapter";
 import { DecodeInfo } from "../../DecodeInfo";
 import { IGeometryProcessor, ILineGeometry, IPolygonGeometry } from "../../IGeometryProcessor";
-import { OmvFeatureFilter } from "../../OmvDataFilter";
-import { OmvGeometryType } from "../../OmvDecoderDefs";
+import {
+    ComposedDataFilter,
+    OmvFeatureFilter,
+    OmvFeatureModifier,
+    OmvGenericFeatureFilter,
+    OmvGenericFeatureModifier
+} from "../../OmvDataFilter";
+import {
+    FeatureModifierId,
+    OmvDecoderOptions,
+    OmvFeatureFilterDescription,
+    OmvGeometryType
+} from "../../OmvDecoderDefs";
+import { OmvPoliticalViewFeatureModifier } from "../../OmvPoliticalViewFeatureModifier";
 import { isArrayBufferLike } from "../../OmvUtils";
+import { StyleSetDataFilter } from "../../StyleSetDataFilter";
 import {
     FeatureAttributes,
     GeometryCommands,
@@ -37,6 +55,8 @@ const propertyCategories = [
     "boolValue"
 ];
 
+const logger = LoggerManager.instance.create("OmvDataAdapter", { enabled: false });
+
 function simplifiedValue(value: com.mapbox.pb.Tile.IValue): Value {
     const hasOwnProperty = Object.prototype.hasOwnProperty;
 
@@ -55,19 +75,14 @@ function simplifiedValue(value: com.mapbox.pb.Tile.IValue): Value {
     throw new Error("not happening");
 }
 
-function replaceReservedName(name: string): string {
-    switch (name) {
-        case "id":
-            return "$id";
-        default:
-            return name;
-    } // switch
-}
-
 function decodeFeatureId(
     feature: com.mapbox.pb.Tile.IFeature,
+    properties: ValueMap,
     logger?: ILogger
 ): number | string | undefined {
+    if (properties.id !== undefined && properties.id !== null) {
+        return properties.id as number | string;
+    }
     if (feature.hasOwnProperty("id")) {
         const id = feature.id;
         if (typeof id === "number") {
@@ -88,16 +103,15 @@ function decodeFeatureId(
 
 function readAttributes(
     layer: com.mapbox.pb.Tile.ILayer,
-    feature: com.mapbox.pb.Tile.IFeature,
-    defaultAttributes: ValueMap = {}
+    feature: com.mapbox.pb.Tile.IFeature
 ): ValueMap {
     const attrs = new FeatureAttributes();
 
-    const attributes: ValueMap = defaultAttributes || {};
+    const attributes: ValueMap = {};
 
     attrs.accept(layer, feature, {
         visitAttribute: (name, value) => {
-            attributes[replaceReservedName(name)] = simplifiedValue(value);
+            attributes[name] = simplifiedValue(value);
             return true;
         }
     });
@@ -105,33 +119,6 @@ function readAttributes(
     return attributes;
 }
 
-export function createFeatureEnv(
-    layer: com.mapbox.pb.Tile.ILayer,
-    feature: com.mapbox.pb.Tile.IFeature,
-    geometryType: string,
-    storageLevel: number,
-    storageLevelOffset?: number,
-    logger?: ILogger,
-    parent?: Env
-): MapEnv {
-    const attributes: ValueMap = {
-        $layer: layer.name,
-        $level: storageLevel,
-        $zoom: Math.max(0, storageLevel - (storageLevelOffset ?? 0)),
-        $geometryType: geometryType
-    };
-
-    // Some sources serve `id` directly as `IFeature` property ...
-    const featureId = decodeFeatureId(feature, logger);
-    if (featureId !== undefined) {
-        attributes.$id = featureId;
-    }
-
-    readAttributes(layer, feature, attributes);
-
-    return new MapEnv(attributes, parent);
-}
-
 export function asGeometryType(feature: com.mapbox.pb.Tile.IFeature | undefined): OmvGeometryType {
     if (feature === undefined) {
         return OmvGeometryType.UNKNOWN;
@@ -204,6 +191,18 @@ function roundUpPolygonCoordinates(geometry: IPolygonGeometry[], layerExtents: n
 function roundUpLineCoordinates(geometry: ILineGeometry[], layerExtents: number) {
     geometry.forEach(line => roundUpCoordinates(line.positions, layerExtents));
 }
+function createFeatureModifier(
+    filterDescription: OmvFeatureFilterDescription,
+    featureModifierId?: FeatureModifierId
+): OmvFeatureModifier {
+    switch (featureModifierId) {
+        case FeatureModifierId.default:
+            return new OmvGenericFeatureModifier(filterDescription);
+        default:
+            assert(!"Unrecognized feature modifier id, using default!");
+            return new OmvGenericFeatureModifier(filterDescription);
+    }
+}
 
 /**
  * The class `OmvDataAdapter` converts OMV protobuf geo data
@@ -211,30 +210,14 @@ function roundUpLineCoordinates(geometry: ILineGeometry[], layerExtents: number)
  */
 
 export class OmvDataAdapter implements DataAdapter, OmvVisitor {
-    id = "omv-protobuf";
-
     private readonly m_geometryCommands = new GeometryCommands();
-    private readonly m_processor: IGeometryProcessor;
-    private readonly m_logger?: ILogger;
-    private m_dataFilter?: OmvFeatureFilter;
 
     private m_tileKey!: TileKey;
     private m_layer!: com.mapbox.pb.Tile.ILayer;
-
-    public roundUpCoordinatesIfNeeded: boolean = false;
-
-    /**
-     * Constructs a new [[OmvProtobufDataAdapter]].
-     *
-     * @param processor - The [[IGeometryProcessor]] used to process the data.
-     * @param dataFilter - The [[OmvFeatureFilter]] used to filter features.
-     * @param logger - The [[ILogger]] used to log diagnostic messages.
-     */
-    constructor(processor: IGeometryProcessor, dataFilter?: OmvFeatureFilter, logger?: ILogger) {
-        this.m_processor = processor;
-        this.m_dataFilter = dataFilter;
-        this.m_logger = logger;
-    }
+    private m_dataFilter?: OmvFeatureFilter;
+    private m_featureModifiers?: OmvFeatureModifier[];
+    private m_processor!: IGeometryProcessor;
+    private m_roundUpCoordinatesIfNeeded: boolean = false;
 
     /**
      * The [[OmvFeatureFilter]] used to filter features.
@@ -244,31 +227,92 @@ export class OmvDataAdapter implements DataAdapter, OmvVisitor {
     }
 
     /**
-     * The [[OmvFeatureFilter]] used to filter features.
+     * Configures the OMV adapter.
+     *
+     * @param options - Configuration options.
+     * @param styleSetEvaluator - Style set evaluator instance, used for filtering.
      */
-    set dataFilter(dataFilter: OmvFeatureFilter | undefined) {
-        this.m_dataFilter = dataFilter;
+    configure(options: OmvDecoderOptions, styleSetEvaluator: StyleSetEvaluator) {
+        if (options.filterDescription !== undefined) {
+            if (options.filterDescription !== null) {
+                // TODO: Feature modifier is always used only with feature filter.
+                // At best the filtering feature should be excluded from other feature
+                // modifiers and be performed solely via OmvGenericFeature modifier or filter.
+                const filterDescription = options.filterDescription;
+                const featureModifiersIds = options.featureModifiers;
+
+                // Create new filter from description.
+                this.m_dataFilter = new OmvGenericFeatureFilter(filterDescription);
+                // Create feature modifiers.
+                const featureModifiers: OmvFeatureModifier[] = [];
+                if (featureModifiersIds !== undefined) {
+                    featureModifiersIds.forEach(fmId => {
+                        featureModifiers.push(createFeatureModifier(filterDescription, fmId));
+                    });
+                } else {
+                    featureModifiers.push(
+                        createFeatureModifier(filterDescription, FeatureModifierId.default)
+                    );
+                }
+                this.m_featureModifiers = featureModifiers;
+            } else {
+                // null is the signal to clear the filter/modifier
+                this.m_dataFilter = undefined;
+                this.m_featureModifiers = undefined;
+            }
+            const styleSetDataFilter = new StyleSetDataFilter(styleSetEvaluator);
+            this.m_dataFilter = this.m_dataFilter
+                ? new ComposedDataFilter([styleSetDataFilter, this.m_dataFilter])
+                : styleSetDataFilter;
+        }
+
+        if (options.politicalView !== undefined) {
+            const politicalView = options.politicalView;
+            let featureModifiers = this.m_featureModifiers;
+            // Remove existing political view modifiers, this actually setups default,
+            // commonly accepted point of view - without feature modifier.
+            if (featureModifiers) {
+                featureModifiers = featureModifiers.filter(
+                    fm => !(fm instanceof OmvPoliticalViewFeatureModifier)
+                );
+            }
+            // If political view is indeed requested append feature modifier at the end of list.
+            if (politicalView.length !== 0) {
+                assert(
+                    politicalView.length === 2,
+                    "The political view must be specified as two letters ISO 3166-1 standard!"
+                );
+                const povFeatureModifier = new OmvPoliticalViewFeatureModifier(politicalView);
+                if (featureModifiers) {
+                    featureModifiers.push(povFeatureModifier);
+                } else {
+                    featureModifiers = [povFeatureModifier];
+                }
+            }
+            // Reset modifiers if nothing was added.
+            this.m_featureModifiers =
+                featureModifiers && featureModifiers.length > 0 ? featureModifiers : undefined;
+        }
+        this.m_roundUpCoordinatesIfNeeded = options.roundUpCoordinatesIfNeeded ?? false;
     }
 
     /**
-     * Checks that the given data can be processed by this [[OmvProtobufDataAdapter]].
+     * @override
      */
     canProcess(data: ArrayBufferLike | {}): boolean {
         return isArrayBufferLike(data);
     }
 
     /**
-     * Processes the given data payload using this adapter's [[IGeometryProcessor]].
-     *
-     * @param data - The data payload to process.
-     * @param decodeInfo - The [[DecodedInfo]] of the tile to proceess.
+     * @override
      */
-    process(data: ArrayBufferLike, decodeInfo: DecodeInfo) {
+    process(data: ArrayBufferLike, decodeInfo: DecodeInfo, geometryProcessor: IGeometryProcessor) {
         const { tileKey } = decodeInfo;
         const payload = new Uint8Array(data);
         const proto = com.mapbox.pb.Tile.decode(payload);
 
         this.m_tileKey = tileKey;
+        this.m_processor = geometryProcessor;
 
         visitOmv(proto, this);
     }
@@ -304,17 +348,22 @@ export class OmvDataAdapter implements DataAdapter, OmvVisitor {
             return;
         }
 
-        const storageLevel = this.m_tileKey.level;
-        const layerName = this.m_layer.name;
-        const layerExtents = this.m_layer.extent ?? 4096;
+        // Pass feature modifier method to processFeature if there's any modifier. Get it from any
+        // modifier, processFeature will later apply it to all using Function.apply().
+        const modifierFunc = this.m_featureModifiers?.[0].doProcessPointFeature;
 
-        if (
-            this.m_dataFilter !== undefined &&
-            !this.m_dataFilter.wantsPointFeature(layerName, asGeometryType(feature), storageLevel)
-        ) {
+        const properties = this.filterAndModifyFeature(
+            feature,
+            this.m_dataFilter?.wantsPointFeature,
+            modifierFunc
+        );
+        if (!properties) {
             return;
         }
 
+        const layerName = this.m_layer.name;
+        const layerExtents = this.m_layer.extent ?? 4096;
+
         const geometry: Vector3[] = [];
         this.m_geometryCommands.accept(feature.geometry, {
             type: "Point",
@@ -329,16 +378,13 @@ export class OmvDataAdapter implements DataAdapter, OmvVisitor {
             return;
         }
 
-        const env = createFeatureEnv(
-            this.m_layer,
-            feature,
-            "point",
-            storageLevel,
-            this.m_processor.storageLevelOffset,
-            this.m_logger
+        this.m_processor.processPointFeature(
+            layerName,
+            layerExtents,
+            geometry,
+            properties,
+            decodeFeatureId(feature, properties, logger)
         );
-
-        this.m_processor.processPointFeature(layerName, layerExtents, geometry, env, storageLevel);
     }
 
     /**
@@ -351,17 +397,22 @@ export class OmvDataAdapter implements DataAdapter, OmvVisitor {
             return;
         }
 
-        const storageLevel = this.m_tileKey.level;
-        const layerName = this.m_layer.name;
-        const layerExtents = this.m_layer.extent ?? 4096;
+        // Pass feature modifier method to processFeature if there's any modifier. Get it from any
+        // modifier, processFeature will later apply it to all using Function.apply().
+        const modifierFunc = this.m_featureModifiers?.[0].doProcessLineFeature;
 
-        if (
-            this.m_dataFilter !== undefined &&
-            !this.m_dataFilter.wantsLineFeature(layerName, asGeometryType(feature), storageLevel)
-        ) {
+        const properties = this.filterAndModifyFeature(
+            feature,
+            this.m_dataFilter?.wantsLineFeature,
+            modifierFunc
+        );
+        if (!properties) {
             return;
         }
 
+        const layerName = this.m_layer.name;
+        const layerExtents = this.m_layer.extent ?? 4096;
+
         const geometry: ILineGeometry[] = [];
         let positions: Vector2[];
         this.m_geometryCommands.accept(feature.geometry, {
@@ -383,17 +434,13 @@ export class OmvDataAdapter implements DataAdapter, OmvVisitor {
         if (this.mustRoundUpCoordinates) {
             roundUpLineCoordinates(geometry, layerExtents);
         }
-
-        const env = createFeatureEnv(
-            this.m_layer,
-            feature,
-            "line",
-            storageLevel,
-            this.m_processor.storageLevelOffset,
-            this.m_logger
+        this.m_processor.processLineFeature(
+            layerName,
+            layerExtents,
+            geometry,
+            properties,
+            decodeFeatureId(feature, properties, logger)
         );
-
-        this.m_processor.processLineFeature(layerName, layerExtents, geometry, env, storageLevel);
     }
 
     /**
@@ -406,17 +453,22 @@ export class OmvDataAdapter implements DataAdapter, OmvVisitor {
             return;
         }
 
-        const storageLevel = this.m_tileKey.level;
-        const layerName = this.m_layer.name;
-        const layerExtents = this.m_layer.extent ?? 4096;
+        // Pass feature modifier method to processFeature if there's any modifier. Get it from any
+        // modifier, processFeature will later apply it to all using Function.apply().
+        const modifierFunc = this.m_featureModifiers?.[0].doProcessPolygonFeature;
 
-        if (
-            this.m_dataFilter !== undefined &&
-            !this.m_dataFilter.wantsPolygonFeature(layerName, asGeometryType(feature), storageLevel)
-        ) {
+        const properties = this.filterAndModifyFeature(
+            feature,
+            this.m_dataFilter?.wantsPolygonFeature,
+            modifierFunc
+        );
+        if (!properties) {
             return;
         }
 
+        const layerName = this.m_layer.name;
+        const layerExtents = this.m_layer.extent ?? 4096;
+
         const geometry: IPolygonGeometry[] = [];
         let currentPolygon: IPolygonGeometry | undefined;
         let currentRing: Vector2[];
@@ -460,27 +512,58 @@ export class OmvDataAdapter implements DataAdapter, OmvVisitor {
 
         checkWinding(geometry);
 
-        const env = createFeatureEnv(
-            this.m_layer,
-            feature,
-            "polygon",
-            storageLevel,
-            this.m_processor.storageLevelOffset,
-            this.m_logger
-        );
-
         this.m_processor.processPolygonFeature(
             layerName,
             layerExtents,
             geometry,
-            env,
-            storageLevel
+            properties,
+            decodeFeatureId(feature, properties, logger)
         );
     }
 
+    /**
+     * Applies any filter and modifiers to a given feature.
+     *
+     * @param feature - The feature to filter and modify.
+     * @param filterFunc - The filtering function.
+     * @param modifierFunc - The modifier function.
+     * @returns The modified feature properties or `undefined` if feature is filtered out.
+     */
+    private filterAndModifyFeature(
+        feature: com.mapbox.pb.Tile.IFeature,
+        filterFunc?: (...args: any[]) => boolean,
+        modifierFunc?: (...args: any[]) => boolean
+    ): ValueMap | undefined {
+        const storageLevel = this.m_tileKey.level;
+        const layerName = this.m_layer.name;
+        const geometryType = asGeometryType(feature);
+
+        if (
+            this.m_dataFilter &&
+            filterFunc!.apply(this.m_dataFilter, [layerName, geometryType, storageLevel]) === false
+        ) {
+            return undefined;
+        }
+
+        const properties = readAttributes(this.m_layer, feature);
+        const env = new MapEnv(properties);
+        if (
+            this.m_featureModifiers?.find(fm => {
+                // TODO: The logic of feature ignore should be actually in the feature filtering
+                // mechanism - see OmvFeatureFilter.
+                assert(modifierFunc !== undefined);
+                return !modifierFunc!.apply(fm, [layerName, env, this.m_tileKey.level]);
+            }) !== undefined
+        ) {
+            return undefined;
+        }
+
+        return properties;
+    }
+
     private get mustRoundUpCoordinates(): boolean {
         return (
-            this.roundUpCoordinatesIfNeeded &&
+            this.m_roundUpCoordinatesIfNeeded &&
             this.m_tileKey.level < 5 &&
             this.m_tileKey.column === this.m_tileKey.columnCount() - 1
         );
diff --git a/@here/harp-vectortile-datasource/package.json b/@here/harp-vectortile-datasource/package.json
index 39d41966f4..8f655e1a26 100644
--- a/@here/harp-vectortile-datasource/package.json
+++ b/@here/harp-vectortile-datasource/package.json
@@ -52,7 +52,7 @@
         "@types/mocha": "^8.2.0",
         "@types/node": "^14.0.5",
         "@types/sinon": "^9.0.10",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "chai": "^4.0.2",
         "copyfiles": "^2.2.0",
         "cross-env": "^7.0.2",
@@ -62,7 +62,7 @@
         "typescript": "^4.1.2"
     },
     "peerDependencies": {
-        "three": "^0.127.0"
+        "three": "^0.129.0"
     },
     "publishConfig": {
         "access": "public"
diff --git a/@here/harp-vectortile-datasource/test/FakeOmvFeatureFilter.ts b/@here/harp-vectortile-datasource/test/FakeOmvFeatureFilter.ts
deleted file mode 100644
index c6132ece6a..0000000000
--- a/@here/harp-vectortile-datasource/test/FakeOmvFeatureFilter.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2021 HERE Europe B.V.
- * Licensed under Apache 2.0, see full license in LICENSE
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { OmvFeatureFilter } from "../lib/OmvDataFilter";
-import { OmvGeometryType } from "../lib/OmvDecoderDefs";
-
-export class FakeOmvFeatureFilter implements OmvFeatureFilter {
-    hasKindFilter: boolean = false;
-    wantsLayer(layer: string, level: number): boolean {
-        return true;
-    }
-
-    wantsPointFeature(layer: string, geometryType: OmvGeometryType, level: number): boolean {
-        return true;
-    }
-
-    wantsLineFeature(layer: string, geometryType: OmvGeometryType, level: number): boolean {
-        return true;
-    }
-
-    wantsPolygonFeature(layer: string, geometryType: OmvGeometryType, level: number): boolean {
-        return true;
-    }
-
-    wantsKind(kind: string | string[]): boolean {
-        return true;
-    }
-}
diff --git a/@here/harp-vectortile-datasource/test/GeoJsonDataAdapterTest.ts b/@here/harp-vectortile-datasource/test/GeoJsonDataAdapterTest.ts
index 43ec8df39e..e51fec5e72 100644
--- a/@here/harp-vectortile-datasource/test/GeoJsonDataAdapterTest.ts
+++ b/@here/harp-vectortile-datasource/test/GeoJsonDataAdapterTest.ts
@@ -4,16 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { mercatorProjection, TileKey } from "@here/harp-geoutils";
+import { mercatorProjection } from "@here/harp-geoutils/lib/projection/MercatorProjection";
+import { TileKey } from "@here/harp-geoutils/lib/tiling/TileKey";
 import { expect } from "chai";
 import * as sinon from "sinon";
 
-import { GeoJsonDataAdapter } from "../lib/adapters/geojson/GeoJsonDataAdapter";
+import {
+    GeoJsonDataAdapter,
+    GeoJsonFeatureCollection
+} from "../lib/adapters/geojson/GeoJsonDataAdapter";
 import { DecodeInfo } from "../lib/DecodeInfo";
-import { FakeOmvFeatureFilter } from "./FakeOmvFeatureFilter";
 import { MockGeometryProcessor } from "./MockGeometryProcessor";
 
-const featureCollection = {
+const featureCollection: GeoJsonFeatureCollection = {
     type: "FeatureCollection",
     features: [
         {
@@ -59,36 +62,53 @@ const featureCollection = {
 };
 
 describe("GeoJsonDataAdapter", function () {
-    let decodeInfo: DecodeInfo;
-    let geometryProcessor: MockGeometryProcessor;
     let adapter: GeoJsonDataAdapter;
 
     beforeEach(function () {
-        decodeInfo = new DecodeInfo("", mercatorProjection, new TileKey(0, 0, 1));
-        geometryProcessor = new MockGeometryProcessor();
-        adapter = new GeoJsonDataAdapter(geometryProcessor, new FakeOmvFeatureFilter());
+        adapter = new GeoJsonDataAdapter();
     });
 
     it("canProcess returns true for a FeatureCollection", function () {
         expect(adapter.canProcess(featureCollection as any)).to.be.true;
     });
 
-    it("process copies geojson feature's id to env's $id", function () {
+    it("sets the specified layer name", () => {
+        const decodeInfo = new DecodeInfo(mercatorProjection, new TileKey(0, 0, 1));
+        const geometryProcessor = new MockGeometryProcessor();
+
         const pointSpy = sinon.spy(geometryProcessor, "processPointFeature");
         const lineSpy = sinon.spy(geometryProcessor, "processLineFeature");
         const polygonSpy = sinon.spy(geometryProcessor, "processPolygonFeature");
-        adapter.process(featureCollection as any, decodeInfo);
 
-        expect(pointSpy.calledOnce);
-        const pointEnv = pointSpy.getCalls()[0].args[3];
-        expect(pointEnv.lookup("$id")).equals(featureCollection.features[0].id);
+        const LAYER_NAME = "foo";
+
+        adapter.process(featureCollection, decodeInfo, geometryProcessor, LAYER_NAME);
+
+        sinon.assert.calledOnce(pointSpy);
+        sinon.assert.calledWith(
+            pointSpy,
+            LAYER_NAME,
+            sinon.match.number,
+            sinon.match.array,
+            sinon.match.object
+        );
 
-        expect(lineSpy.calledOnce);
-        const lineEnv = lineSpy.getCalls()[0].args[3];
-        expect(lineEnv.lookup("$id")).equals(featureCollection.features[1].id);
+        sinon.assert.calledOnce(lineSpy);
+        sinon.assert.calledWith(
+            lineSpy,
+            LAYER_NAME,
+            sinon.match.number,
+            sinon.match.array,
+            sinon.match.object
+        );
 
-        expect(polygonSpy.calledOnce);
-        const polygonEnv = polygonSpy.getCalls()[0].args[3];
-        expect(polygonEnv.lookup("$id")).equals(featureCollection.features[2].id);
+        sinon.assert.calledOnce(polygonSpy);
+        sinon.assert.calledWith(
+            polygonSpy,
+            LAYER_NAME,
+            sinon.match.number,
+            sinon.match.array,
+            sinon.match.object
+        );
     });
 });
diff --git a/@here/harp-vectortile-datasource/test/GeoJsonVtDataAdapterTest.ts b/@here/harp-vectortile-datasource/test/GeoJsonVtDataAdapterTest.ts
index 07a8e16457..2faa8f3ac7 100644
--- a/@here/harp-vectortile-datasource/test/GeoJsonVtDataAdapterTest.ts
+++ b/@here/harp-vectortile-datasource/test/GeoJsonVtDataAdapterTest.ts
@@ -10,7 +10,6 @@ import * as sinon from "sinon";
 
 import { GeoJsonVtDataAdapter } from "../lib/adapters/geojson-vt/GeoJsonVtDataAdapter";
 import { DecodeInfo } from "../lib/DecodeInfo";
-import { FakeOmvFeatureFilter } from "./FakeOmvFeatureFilter";
 import { MockGeometryProcessor } from "./MockGeometryProcessor";
 
 enum VTJsonGeometryType {
@@ -107,37 +106,18 @@ describe("GeoJsonVtDataAdapter", function () {
     let adapter: GeoJsonVtDataAdapter;
 
     beforeEach(function () {
-        decodeInfo = new DecodeInfo("", mercatorProjection, new TileKey(0, 0, 1));
+        decodeInfo = new DecodeInfo(mercatorProjection, new TileKey(0, 0, 1));
         geometryProcessor = new MockGeometryProcessor();
-        adapter = new GeoJsonVtDataAdapter(geometryProcessor, new FakeOmvFeatureFilter());
+        adapter = new GeoJsonVtDataAdapter();
     });
 
     it("canProcess returns true for a geojson-vt Tile", function () {
         expect(adapter.canProcess(geojsonVtTile as any)).to.be.true;
     });
 
-    it("process copies geojson-vt feature's id to env's $id", function () {
-        const pointSpy = sinon.spy(geometryProcessor, "processPointFeature");
-        const lineSpy = sinon.spy(geometryProcessor, "processLineFeature");
-        const polygonSpy = sinon.spy(geometryProcessor, "processPolygonFeature");
-        adapter.process(geojsonVtTile as any, decodeInfo);
-
-        expect(pointSpy.calledOnce);
-        const pointEnv = pointSpy.getCalls()[0].args[3];
-        expect(pointEnv.lookup("$id")).equals(geojsonVtTile.features[0].id);
-
-        expect(lineSpy.calledOnce);
-        const lineEnv = lineSpy.getCalls()[0].args[3];
-        expect(lineEnv.lookup("$id")).equals(geojsonVtTile.features[1].id);
-
-        expect(polygonSpy.calledOnce);
-        const polygonEnv = polygonSpy.getCalls()[0].args[3];
-        expect(polygonEnv.lookup("$id")).equals(geojsonVtTile.features[2].id);
-    });
-
     it("process tile's polygon geometries and create a single polygon from nested rings", function () {
         const polygonSpy = sinon.spy(geometryProcessor, "processPolygonFeature");
-        adapter.process(geojsonVtTile as any, decodeInfo);
+        adapter.process(geojsonVtTile as any, decodeInfo, geometryProcessor);
 
         expect(polygonSpy.calledOnce);
         const polygons = polygonSpy.getCalls()[0].args[2];
diff --git a/@here/harp-vectortile-datasource/test/MockGeometryProcessor.ts b/@here/harp-vectortile-datasource/test/MockGeometryProcessor.ts
index 1490567fbc..9b86a5e516 100644
--- a/@here/harp-vectortile-datasource/test/MockGeometryProcessor.ts
+++ b/@here/harp-vectortile-datasource/test/MockGeometryProcessor.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { MapEnv } from "@here/harp-datasource-protocol";
+import { ValueMap } from "@here/harp-datasource-protocol";
 import { Vector3 } from "three";
 
 import { IGeometryProcessor, ILineGeometry, IPolygonGeometry } from "../lib/IGeometryProcessor";
@@ -13,25 +13,22 @@ export class MockGeometryProcessor implements IGeometryProcessor {
     storageLevelOffset?: number | undefined;
     processPointFeature(
         layerName: string,
-        layerExtents: number,
+        tileExtents: number,
         geometry: Vector3[],
-        env: MapEnv,
-        storageLevel: number
+        properties: ValueMap
     ): void {}
 
     processLineFeature(
         layerName: string,
-        layerExtents: number,
+        tileExtents: number,
         geometry: ILineGeometry[],
-        env: MapEnv,
-        storageLevel: number
+        properties: ValueMap
     ): void {}
 
     processPolygonFeature(
         layerName: string,
-        layerExtents: number,
+        tileExtents: number,
         geometry: IPolygonGeometry[],
-        env: MapEnv,
-        storageLevel: number
+        properties: ValueMap
     ): void {}
 }
diff --git a/@here/harp-vectortile-datasource/test/OmvDataAdapterTest.ts b/@here/harp-vectortile-datasource/test/OmvDataAdapterTest.ts
index 907b4d2c3a..18e54aef98 100644
--- a/@here/harp-vectortile-datasource/test/OmvDataAdapterTest.ts
+++ b/@here/harp-vectortile-datasource/test/OmvDataAdapterTest.ts
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { StyleSetEvaluator } from "@here/harp-datasource-protocol/index-decoder";
 import { mercatorProjection, TileKey } from "@here/harp-geoutils";
 import { expect } from "chai";
 import * as sinon from "sinon";
@@ -11,7 +12,13 @@ import * as sinon from "sinon";
 import { OmvDataAdapter } from "../lib/adapters/omv/OmvDataAdapter";
 import { com } from "../lib/adapters/omv/proto/vector_tile";
 import { DecodeInfo } from "../lib/DecodeInfo";
-import { FakeOmvFeatureFilter } from "./FakeOmvFeatureFilter";
+import { OmvFeatureFilterDescriptionBuilder } from "../lib/OmvDataFilter";
+import {
+    OmvFeatureFilterDescription,
+    OmvFilterDescription,
+    OmvFilterString,
+    OmvGeometryType
+} from "../lib/OmvDecoderDefs";
 import { MockGeometryProcessor } from "./MockGeometryProcessor";
 
 enum VTJsonGeometryType {
@@ -115,6 +122,10 @@ const WrongWindingMultiPolygon = [
     15 // end Polygon2#interior
 ];
 
+const line = [9, 0, 0, 26, 20, 0, 0, 20, 19, 0, 15];
+
+const point = [9, 0, 0, 15];
+
 const MVTLayer = {
     name: "layer",
     features: [
@@ -129,17 +140,20 @@ const MVTLayer = {
 const MVTTile = {
     layers: [MVTLayer]
 };
-
 describe("OmvDataAdapter", function () {
     let decodeInfo: DecodeInfo;
     let geometryProcessor: MockGeometryProcessor;
     let adapter: OmvDataAdapter;
+    let styleSetEvaluator: StyleSetEvaluator;
     let TileDecodeStub: any;
 
     beforeEach(function () {
-        decodeInfo = new DecodeInfo("", mercatorProjection, new TileKey(0, 0, 1));
+        decodeInfo = new DecodeInfo(mercatorProjection, new TileKey(0, 0, 1));
         geometryProcessor = new MockGeometryProcessor();
-        adapter = new OmvDataAdapter(geometryProcessor, new FakeOmvFeatureFilter());
+        adapter = new OmvDataAdapter();
+        styleSetEvaluator = new StyleSetEvaluator({ styleSet: [] });
+        sinon.stub(styleSetEvaluator, "wantsLayer").returns(true);
+        sinon.stub(styleSetEvaluator, "wantsFeature").returns(true);
         TileDecodeStub = sinon.stub(com.mapbox.pb.Tile, "decode");
     });
 
@@ -150,7 +164,7 @@ describe("OmvDataAdapter", function () {
     it("process polygon geometries with correct winding", function () {
         const polygonSpy = sinon.spy(geometryProcessor, "processPolygonFeature");
         TileDecodeStub.returns(MVTTile);
-        adapter.process(1 as any, decodeInfo);
+        adapter.process(1 as any, decodeInfo, geometryProcessor);
         const polygons = polygonSpy.getCalls()[0].args[2];
         expect(polygons.length).equals(2);
     });
@@ -165,8 +179,249 @@ describe("OmvDataAdapter", function () {
         tile.layers = [layer];
         TileDecodeStub.returns(tile);
 
-        adapter.process(fakeData as any, decodeInfo);
+        adapter.process(fakeData as any, decodeInfo, geometryProcessor);
         const polygons = polygonSpy.getCalls()[0].args[2];
         expect(polygons.length).equals(2);
     });
+
+    const layerName = "boundaries";
+    const attrKey = "fakeAttribute";
+    const attrValue = 42;
+    const defFeatureFilter = new OmvFeatureFilterDescriptionBuilder().createDescription();
+    const defFilter: OmvFilterDescription = {
+        layerName: { value: layerName, match: OmvFilterString.StringMatch.Match },
+        minLevel: 0,
+        maxLevel: 20,
+        geometryTypes: [OmvGeometryType.POINT, OmvGeometryType.LINESTRING, OmvGeometryType.POLYGON]
+    };
+    interface TestInstance {
+        visitMethod: "visitPointFeature" | "visitLineFeature" | "visitPolygonFeature";
+        processorMethod: "processPointFeature" | "processLineFeature" | "processPolygonFeature";
+        geometryType: com.mapbox.pb.Tile.GeomType;
+        geometry: number[];
+        filterDescription: OmvFeatureFilterDescription;
+        modifierDescription: OmvFeatureFilterDescription;
+    }
+    const testInstances: TestInstance[] = [
+        {
+            visitMethod: "visitPointFeature",
+            processorMethod: "processPointFeature",
+            geometryType: com.mapbox.pb.Tile.GeomType.POINT,
+            geometry: point,
+            filterDescription: { ...defFeatureFilter, processPointsDefault: false },
+            modifierDescription: {
+                ...defFeatureFilter,
+                processPointsDefault: false,
+                pointsToProcess: [
+                    {
+                        ...defFilter,
+                        featureAttribute: { key: attrKey, value: attrValue }
+                    }
+                ]
+            }
+        },
+        {
+            visitMethod: "visitLineFeature",
+            processorMethod: "processLineFeature",
+            geometryType: com.mapbox.pb.Tile.GeomType.LINESTRING,
+            geometry: line,
+            filterDescription: { ...defFeatureFilter, processLinesDefault: false },
+            modifierDescription: {
+                ...defFeatureFilter,
+                processLinesDefault: false,
+                linesToProcess: [
+                    {
+                        ...defFilter,
+                        featureAttribute: { key: attrKey, value: attrValue }
+                    }
+                ]
+            }
+        },
+        {
+            visitMethod: "visitPolygonFeature",
+            processorMethod: "processPolygonFeature",
+            geometryType: com.mapbox.pb.Tile.GeomType.POLYGON,
+            geometry: MultiPolygon,
+            filterDescription: { ...defFeatureFilter, processPolygonsDefault: false },
+            modifierDescription: {
+                ...defFeatureFilter,
+                processPolygonsDefault: false,
+                polygonsToProcess: [
+                    {
+                        ...defFilter,
+                        featureAttribute: { key: attrKey, value: attrValue }
+                    }
+                ]
+            }
+        }
+    ];
+    for (const testInstance of testInstances) {
+        const visitMethod = testInstance.visitMethod;
+        const processorMethod = testInstance.processorMethod;
+        const type = testInstance.geometryType;
+        const geometry = testInstance.geometry;
+        const filterDescription = testInstance.filterDescription;
+        const modifierDescription = testInstance.modifierDescription;
+
+        const extent = 4096;
+        const layer: com.mapbox.pb.Tile.ILayer = {
+            version: 0,
+            name: layerName,
+            extent,
+            keys: ["kind:aq", "id"],
+            values: [{ stringValue: "disputed boundary" }, { intValue: 42 }]
+        };
+        const kindTags = [0, 0]; // Indices to attributes names in layer.keys and values in layer.values.
+        const idTags = [1, 1]; // Indices to id attribute name and value.
+
+        describe(`${visitMethod}`, function () {
+            let processSpy: sinon.SinonSpy<any>;
+            beforeEach(function () {
+                processSpy = sinon.spy(geometryProcessor, processorMethod);
+                TileDecodeStub.returns({ layers: [] });
+                adapter.process(new ArrayBuffer(0), decodeInfo, geometryProcessor);
+                adapter.visitLayer(layer);
+            });
+
+            it("gets feature id from properties if present, otherwise from feature.id", function () {
+                adapter.configure({}, styleSetEvaluator);
+                const featureId = 13;
+                adapter[visitMethod]({ geometry, type, id: featureId, tags: idTags });
+
+                expect(processSpy.calledOnce).is.true;
+                const id = processSpy.firstCall.args[4];
+                expect(id).equals(layer.values![1].intValue);
+                processSpy.resetHistory();
+
+                // Remove the id property, id should be taken now from feature.id.
+                adapter.configure({}, styleSetEvaluator);
+                adapter[visitMethod]({ geometry, type, id: featureId });
+
+                expect(processSpy.calledOnce).is.true;
+                const newId = processSpy.firstCall.args[4];
+                expect(newId).equals(featureId);
+            });
+
+            it("applies feature modifiers before finding matching techniques", function () {
+                // Filter out feature using attribute value, checked by modifier.
+                adapter.configure({ filterDescription: modifierDescription }, styleSetEvaluator);
+                adapter[visitMethod]({ geometry, type });
+
+                expect(processSpy.calledOnce).is.false;
+
+                // Remove the modifier and check the feature reaches the geometry processor.
+                adapter.configure({ filterDescription: null }, styleSetEvaluator);
+                adapter[visitMethod]({ geometry, type });
+
+                expect(processSpy.calledOnce).is.true;
+            });
+
+            if (type === com.mapbox.pb.Tile.GeomType.LINESTRING) {
+                it("applies political view modifiers", function () {
+                    // Configure political view.
+                    adapter.configure({ politicalView: "aq" }, styleSetEvaluator);
+                    adapter[visitMethod]({ geometry, type, tags: kindTags });
+
+                    expect(processSpy.calledOnce).is.true;
+                    const kind = processSpy.firstCall.args[3]["kind"];
+                    expect(kind).equals(layer.values![0].stringValue);
+                    processSpy.resetHistory();
+
+                    // Set to default political view.
+                    adapter.configure({ politicalView: "" }, styleSetEvaluator);
+                    adapter[visitMethod]({ geometry, type, tags: kindTags });
+
+                    expect(processSpy.calledOnce).is.true;
+                    const newKind = processSpy.firstCall.args[3]["kind"];
+                    expect(newKind).to.be.undefined;
+                });
+            }
+
+            it("filters features", function () {
+                // Filter out feature geometry type entirely.
+                adapter.configure({ filterDescription }, styleSetEvaluator);
+                adapter[visitMethod]({ geometry, type });
+
+                expect(processSpy.calledOnce).is.false;
+
+                // Remove the filter and check the feature reaches the geometry processor.
+                adapter.configure({ filterDescription: null }, styleSetEvaluator);
+                adapter[visitMethod]({ geometry, type });
+
+                expect(processSpy.calledOnce).is.true;
+            });
+
+            if (type !== com.mapbox.pb.Tile.GeomType.POINT) {
+                // (0,0) -> (extent-1,extent-1)
+                const lineAtBorder = [9, 0, 0, 10, (extent - 1) << 1, (extent - 1) << 1, 15];
+
+                function getEndCoords() {
+                    expect(processSpy.calledOnce);
+                    const geometries = processSpy.firstCall.args[2];
+                    expect(geometries).has.lengthOf(1);
+                    const geometry = geometries[0];
+                    processSpy.resetHistory();
+                    return geometry.positions ? geometry.positions[1] : geometry.rings[0][1];
+                }
+
+                it("does not round up x coordinates by default", function () {
+                    adapter.configure({}, styleSetEvaluator);
+
+                    adapter[visitMethod]({ geometry: lineAtBorder, type });
+
+                    const endCoord = getEndCoords();
+                    expect(endCoord.x).equals(extent - 1);
+                    expect(endCoord.y).equals(extent - 1);
+                });
+
+                it("does not round up x coordinates if tile is not at antimer. on level <5", function () {
+                    adapter.configure({ roundUpCoordinatesIfNeeded: true }, styleSetEvaluator);
+                    // Level too high.
+                    adapter.process(
+                        new ArrayBuffer(0),
+                        { tileKey: new TileKey(0, TileKey.columnsAtLevel(5) - 1, 5) } as DecodeInfo,
+                        geometryProcessor
+                    );
+
+                    adapter[visitMethod]({ geometry: lineAtBorder, type });
+
+                    {
+                        const endCoord = getEndCoords();
+                        expect(endCoord.x).equals(extent - 1);
+                        expect(endCoord.y).equals(extent - 1);
+                    }
+
+                    // Tile not at antimeridian.
+                    adapter.process(
+                        new ArrayBuffer(0),
+                        { tileKey: new TileKey(0, TileKey.columnsAtLevel(4) - 2, 4) } as DecodeInfo,
+                        geometryProcessor
+                    );
+
+                    adapter[visitMethod]({ geometry: lineAtBorder, type });
+
+                    const endCoord = getEndCoords();
+                    expect(endCoord.x).equals(extent - 1);
+                    expect(endCoord.y).equals(extent - 1);
+                });
+
+                it("rounds up x coordinates if flag set and tile at antimeridian on level <5", function () {
+                    adapter.configure({ roundUpCoordinatesIfNeeded: true }, styleSetEvaluator);
+
+                    adapter.process(
+                        new ArrayBuffer(0),
+                        { tileKey: new TileKey(0, TileKey.columnsAtLevel(4) - 1, 4) } as DecodeInfo,
+                        geometryProcessor
+                    );
+
+                    adapter[visitMethod]({ geometry: lineAtBorder, type });
+
+                    const endCoord = getEndCoords();
+                    expect(endCoord.x).equals(extent);
+                    expect(endCoord.y).equals(extent - 1);
+                    processSpy.resetHistory();
+                });
+            }
+        });
+    }
 });
diff --git a/@here/harp-vectortile-datasource/test/OmvDecodedTileEmitterTest.ts b/@here/harp-vectortile-datasource/test/OmvDecodedTileEmitterTest.ts
index 167bfbf615..a992e759b3 100644
--- a/@here/harp-vectortile-datasource/test/OmvDecodedTileEmitterTest.ts
+++ b/@here/harp-vectortile-datasource/test/OmvDecodedTileEmitterTest.ts
@@ -45,7 +45,6 @@ const layer = "dummy";
 describe("OmvDecodedTileEmitter", function () {
     function createTileEmitter(
         decodeInfo: DecodeInfo = new DecodeInfo(
-            "test",
             mercatorProjection,
             TileKey.fromRowColumnLevel(0, 0, 1)
         ),
@@ -64,13 +63,7 @@ describe("OmvDecodedTileEmitter", function () {
     } {
         const styleSetEvaluator = new StyleSetEvaluator({ styleSet });
 
-        const tileEmitter = new OmvDecodedTileEmitterTest(
-            decodeInfo,
-            styleSetEvaluator,
-            false,
-            false,
-            false
-        );
+        const tileEmitter = new OmvDecodedTileEmitterTest(decodeInfo, styleSetEvaluator);
 
         return { tileEmitter, styleSetEvaluator };
     }
@@ -122,7 +115,7 @@ describe("OmvDecodedTileEmitter", function () {
     ]) {
         const result = expectScaledHeight ? "scaled" : "not scaled";
         const tileKey = TileKey.fromRowColumnLevel(0, 0, level);
-        const decodeInfo = new DecodeInfo("test", mercatorProjection, tileKey);
+        const decodeInfo = new DecodeInfo(mercatorProjection, tileKey);
 
         function getExpectedHeight(
             geoAltitude: number,
@@ -253,7 +246,7 @@ describe("OmvDecodedTileEmitter", function () {
         const tileKey = TileKey.fromRowColumnLevel(0, 0, 1);
         const projection = mercatorProjection;
 
-        const decodeInfo = new DecodeInfo("test", projection, tileKey);
+        const decodeInfo = new DecodeInfo(projection, tileKey);
         const polygons = tileGeoBoxToPolygonGeometry(decodeInfo);
 
         const { tileEmitter, styleSetEvaluator } = createTileEmitter(decodeInfo);
@@ -315,7 +308,7 @@ describe("OmvDecodedTileEmitter", function () {
         const tileKey = TileKey.fromRowColumnLevel(0, 0, 1);
         const projection = mercatorProjection;
 
-        const decodeInfo = new DecodeInfo("test", projection, tileKey);
+        const decodeInfo = new DecodeInfo(projection, tileKey);
         const polygons: IPolygonGeometry[] = [
             {
                 rings: [
@@ -395,7 +388,7 @@ describe("OmvDecodedTileEmitter", function () {
         const tileKey = TileKey.fromRowColumnLevel(0, 0, 1);
         const projection = mercatorProjection;
 
-        const decodeInfo = new DecodeInfo("test", projection, tileKey);
+        const decodeInfo = new DecodeInfo(projection, tileKey);
         const polygons: IPolygonGeometry[] = [
             {
                 rings: [
diff --git a/@here/harp-vectortile-datasource/test/VectorTileDataProcessorTest.ts b/@here/harp-vectortile-datasource/test/VectorTileDataProcessorTest.ts
new file mode 100644
index 0000000000..86b76f5033
--- /dev/null
+++ b/@here/harp-vectortile-datasource/test/VectorTileDataProcessorTest.ts
@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2021 HERE Europe B.V.
+ * Licensed under Apache 2.0, see full license in LICENSE
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { GeometryKind, IndexedTechnique } from "@here/harp-datasource-protocol";
+import { StyleSetEvaluator } from "@here/harp-datasource-protocol/index-decoder";
+import { mercatorProjection, TileKey } from "@here/harp-geoutils";
+import { expect } from "chai";
+import * as sinon from "sinon";
+import { Vector2, Vector3 } from "three";
+
+import { VectorTileDataProcessor, VectorTileDataProcessorOptions } from "../index-worker";
+import { DataAdapter } from "../lib/DataAdapter";
+import { DecodeInfo } from "../lib/DecodeInfo";
+import { IGeometryProcessor, ILineGeometry, IPolygonGeometry } from "../lib/IGeometryProcessor";
+import { OmvFeatureFilter } from "../lib/OmvDataFilter";
+import { OmvGeometryType } from "../lib/OmvDecoderDefs";
+import { VectorTileDataEmitter } from "../lib/VectorTileDataEmitter";
+
+//    Mocha discourages using arrow functions, see https://mochajs.org/#arrow-functions
+
+class FakeDataAdapter implements DataAdapter {
+    canProcess(data: {} | ArrayBufferLike): boolean {
+        return true;
+    }
+
+    process(
+        data: {} | ArrayBufferLike,
+        decodeInfo: DecodeInfo,
+        geometryProcessor: IGeometryProcessor
+    ): void {}
+}
+
+class FakeFeatureFilter implements OmvFeatureFilter {
+    hasKindFilter: boolean = true;
+
+    wantsLayer(layer: string, level: number): boolean {
+        return true;
+    }
+
+    wantsPointFeature(layer: string, geometryType: OmvGeometryType, level: number): boolean {
+        return true;
+    }
+
+    wantsLineFeature(layer: string, geometryType: OmvGeometryType, level: number): boolean {
+        return true;
+    }
+
+    wantsPolygonFeature(layer: string, geometryType: OmvGeometryType, level: number): boolean {
+        return true;
+    }
+
+    wantsKind(kind: string | string[]): boolean {
+        return true;
+    }
+}
+
+describe("VectorTileDataProcessor", function () {
+    let processor: VectorTileDataProcessor;
+    let dataAdapter: DataAdapter;
+    let featureFilter: FakeFeatureFilter;
+    let styleSetEvaluator: StyleSetEvaluator;
+    const tileKey = new TileKey(0, 0, 2);
+    const storageLevelOffset = 1;
+
+    beforeEach(function () {
+        styleSetEvaluator = new StyleSetEvaluator({ styleSet: [] });
+        dataAdapter = new FakeDataAdapter();
+        featureFilter = new FakeFeatureFilter();
+        processor = new VectorTileDataProcessor(
+            tileKey,
+            mercatorProjection,
+            styleSetEvaluator,
+            dataAdapter,
+            { storageLevelOffset } as VectorTileDataProcessorOptions,
+            featureFilter
+        );
+    });
+
+    afterEach(function () {
+        sinon.restore();
+    });
+
+    function createPointGeometry(): Vector3[] {
+        return [new Vector3(0, 0, 0)];
+    }
+
+    function createLineGeometry(): ILineGeometry[] {
+        return [{ positions: [new Vector2(0, 0), new Vector2(1, 1)] }];
+    }
+
+    function createPolygonGeometry(): IPolygonGeometry[] {
+        return [{ rings: [[new Vector2(0, 0), new Vector2(1, 1)]] }];
+    }
+
+    interface TestInstance {
+        processorMethod: "processPointFeature" | "processLineFeature" | "processPolygonFeature";
+        geometryType: "point" | "line" | "polygon";
+        geometryGenerator: () => any;
+    }
+    const testInstances: TestInstance[] = [
+        {
+            processorMethod: "processPointFeature",
+            geometryType: "point",
+            geometryGenerator: createPointGeometry
+        },
+        {
+            processorMethod: "processLineFeature",
+            geometryType: "line",
+            geometryGenerator: createLineGeometry
+        },
+        {
+            processorMethod: "processPolygonFeature",
+            geometryType: "polygon",
+            geometryGenerator: createPolygonGeometry
+        }
+    ];
+    for (const testInstance of testInstances) {
+        const processorMethod = testInstance.processorMethod;
+        const geometryType = testInstance.geometryType;
+        const geometryGenerator = testInstance.geometryGenerator;
+        const dummyExtents = 4096;
+        const featureId = 42;
+        const layerName = "fakelayer";
+
+        describe(`${processorMethod}`, function () {
+            it("sets reserved feature properties", function () {
+                const styleEvalSpy = sinon.spy(styleSetEvaluator, "getMatchingTechniques");
+                sinon
+                    .stub(dataAdapter, "process")
+                    .callsFake((data, decodeInfo, geometryProcessor: IGeometryProcessor) => {
+                        geometryProcessor[processorMethod](
+                            layerName,
+                            dummyExtents,
+                            geometryGenerator(),
+                            {},
+                            featureId
+                        );
+                    });
+                processor.getDecodedTile({});
+
+                expect(styleEvalSpy.calledOnce).is.true;
+
+                const mapEnv = styleEvalSpy.firstCall.args[0];
+
+                expect(mapEnv.lookup("$layer")).equals(layerName);
+                expect(mapEnv.lookup("$id")).equals(featureId);
+                expect(mapEnv.lookup("$level")).equals(tileKey.level);
+                expect(mapEnv.lookup("$zoom")).equals(tileKey.level - storageLevelOffset);
+                expect(mapEnv.lookup("$geometryType")).equals(geometryType);
+            });
+
+            it("filters techniques by kind", function () {
+                const matchingTechniques: IndexedTechnique[] = [
+                    {
+                        name: "line",
+                        color: "red",
+                        lineWidth: 1,
+                        _index: 0,
+                        _styleSetIndex: 0,
+                        kind: GeometryKind.Road
+                    },
+                    {
+                        name: "line",
+                        color: "red",
+                        lineWidth: 1,
+                        _index: 0,
+                        _styleSetIndex: 0,
+                        kind: GeometryKind.Border
+                    }
+                ];
+                sinon
+                    .stub(styleSetEvaluator, "getMatchingTechniques")
+                    .callsFake(() => matchingTechniques);
+                sinon.stub(styleSetEvaluator, "techniques").get(() => matchingTechniques);
+                sinon.stub(styleSetEvaluator, "decodedTechniques").get(() => matchingTechniques);
+                sinon
+                    .stub(dataAdapter, "process")
+                    .callsFake((data, decodeInfo, geometryProcessor: IGeometryProcessor) => {
+                        geometryProcessor[processorMethod](
+                            layerName,
+                            dummyExtents,
+                            geometryGenerator(),
+                            {},
+                            featureId
+                        );
+                    });
+
+                sinon.stub(featureFilter, "wantsKind").callsFake((kind: string | string[]) => {
+                    return kind === GeometryKind.Road;
+                });
+                const emitterSpy = sinon.spy(
+                    VectorTileDataEmitter.prototype,
+                    processorMethod as any
+                );
+
+                processor.getDecodedTile({});
+
+                expect(emitterSpy.calledOnce);
+                const filteredTechniques = emitterSpy.firstCall.args[4] as IndexedTechnique[];
+                expect(filteredTechniques).to.have.lengthOf(1);
+                expect(filteredTechniques[0].kind).equals(GeometryKind.Road);
+            });
+        });
+    }
+});
diff --git a/@here/harp-vectortile-datasource/test/VectorTileDecoderTest.ts b/@here/harp-vectortile-datasource/test/VectorTileDecoderTest.ts
index 4d79e7d066..a8bbf6843d 100644
--- a/@here/harp-vectortile-datasource/test/VectorTileDecoderTest.ts
+++ b/@here/harp-vectortile-datasource/test/VectorTileDecoderTest.ts
@@ -3,16 +3,25 @@
  * Licensed under Apache 2.0, see full license in LICENSE
  * SPDX-License-Identifier: Apache-2.0
  */
+import { StyleSetEvaluator } from "@here/harp-datasource-protocol/index-decoder";
 import { mercatorProjection, TileKey } from "@here/harp-geoutils";
 import { silenceLoggingAroundFunction } from "@here/harp-test-utils";
-import { expect } from "chai";
+import * as chai from "chai";
+// Install chai-as-promised plugin to support promise assertions like:
+// expect(promise).to.eventually.be.rejectedWith()
+import * as chaiAsPromised from "chai-as-promised";
+import * as sinon from "sinon";
 
 import { VectorTileDecoder } from "../index-worker";
+import { OmvDataAdapter } from "../lib/adapters/omv/OmvDataAdapter";
+import { DataAdapter } from "../lib/DataAdapter";
+chai.use(chaiAsPromised);
+const { expect } = chai;
 
 //    Mocha discourages using arrow functions, see https://mochajs.org/#arrow-functions
 
 describe("ThemedTileDecoder", function () {
-    it("#decodeTile does not throw", async function () {
+    it("#decodeTile does not throw if styleSet was not configured", async function () {
         const target = new VectorTileDecoder();
 
         silenceLoggingAroundFunction("ThemedTileDecoder", async () => {
@@ -26,3 +35,105 @@ describe("ThemedTileDecoder", function () {
         });
     });
 });
+
+class VectorTileDecoderTest extends VectorTileDecoder {
+    adapter = new OmvDataAdapter();
+
+    /** @override */
+    getDataAdapter(data: ArrayBufferLike | {}): DataAdapter | undefined {
+        return this.adapter;
+    }
+}
+
+describe("VectorTileDecoder", function () {
+    let tileKey: TileKey;
+    let styleSetEvaluator: StyleSetEvaluator;
+
+    beforeEach(function () {
+        tileKey = new TileKey(0, 0, 1);
+        styleSetEvaluator = new StyleSetEvaluator({ styleSet: [] });
+    });
+    afterEach(function () {
+        sinon.restore();
+    });
+
+    it("#decodeThemedTile rejects promise if data is not supported", function () {
+        const tilePromise = new VectorTileDecoder().decodeThemedTile(
+            {},
+            tileKey,
+            styleSetEvaluator,
+            mercatorProjection
+        );
+
+        return expect(tilePromise).to.eventually.be.rejected;
+    });
+
+    it("#configure overwrites old options with newly defined ones", function () {
+        const politicalView = "tlh";
+        let storageLevelOffset = 1;
+        let filterDescription = {};
+        let roundUpCoordinatesIfNeeded = true;
+
+        const decoder = new VectorTileDecoderTest();
+        const adapter = decoder.adapter;
+        const processStub = sinon.stub(adapter, "process").returns();
+        const configureStub = sinon.stub(adapter, "configure").returns();
+        sinon.stub(adapter, "canProcess").returns(true);
+
+        decoder.configure(
+            {},
+            {
+                storageLevelOffset,
+                politicalView,
+                filterDescription,
+                roundUpCoordinatesIfNeeded
+            }
+        );
+
+        const promise = decoder.decodeThemedTile(
+            {},
+            tileKey,
+            styleSetEvaluator,
+            mercatorProjection
+        );
+        return expect(promise).to.eventually.be.fulfilled.then(() => {
+            expect(configureStub.calledOnce).is.true;
+            expect(processStub.calledOnce).is.true;
+
+            const options = configureStub.firstCall.args[0];
+            expect(options.roundUpCoordinatesIfNeeded).equals(roundUpCoordinatesIfNeeded);
+            expect(options.politicalView).equals(politicalView);
+            expect(options.filterDescription).equals(filterDescription);
+            expect(processStub.firstCall.args[1].storageLevelOffset).equals(storageLevelOffset);
+
+            configureStub.resetHistory();
+            processStub.resetHistory();
+
+            filterDescription = {};
+            roundUpCoordinatesIfNeeded = !roundUpCoordinatesIfNeeded;
+            storageLevelOffset += storageLevelOffset;
+
+            // no new political view passed, it old value should be used.
+            decoder.configure(
+                {},
+                {
+                    storageLevelOffset,
+                    filterDescription,
+                    roundUpCoordinatesIfNeeded
+                }
+            );
+            return expect(
+                decoder.decodeThemedTile({}, tileKey, styleSetEvaluator, mercatorProjection)
+            ).to.eventually.be.fulfilled.then(() => {
+                expect(configureStub.calledOnce).is.true;
+                expect(processStub.calledOnce).is.true;
+
+                const newOptions = configureStub.firstCall.args[0];
+                expect(newOptions.roundUpCoordinatesIfNeeded).equals(roundUpCoordinatesIfNeeded);
+                expect(newOptions.politicalView).equals(politicalView);
+                expect(newOptions.filterDescription).equals(filterDescription);
+                expect(processStub.firstCall.args[1].storageLevelOffset).equals(storageLevelOffset);
+            });
+        });
+    });
+});
diff --git a/@here/harp-webtile-datasource/lib/WebTileLoader.ts b/@here/harp-webtile-datasource/lib/WebTileLoader.ts
index bbd6c91cee..1e53f785fe 100644
--- a/@here/harp-webtile-datasource/lib/WebTileLoader.ts
+++ b/@here/harp-webtile-datasource/lib/WebTileLoader.ts
@@ -54,6 +54,10 @@ export class WebTileLoader extends BaseTileLoader {
                 texture.minFilter = THREE.LinearFilter;
                 texture.magFilter = THREE.LinearFilter;
                 texture.generateMipmaps = false;
+                // This is required because the WebTileDataSource uses the default setting of
+                // useGeometryLoader on the DataSource, so it has to clear the tile's objects
+                // manually.
+                this.tile.clear();
                 this.tile.addOwnedTexture(texture);
                 const planeMesh = addGroundPlane(
                     this.tile,
diff --git a/@here/harp-webtile-datasource/package.json b/@here/harp-webtile-datasource/package.json
index 77128a9a4b..8315e6ec7a 100644
--- a/@here/harp-webtile-datasource/package.json
+++ b/@here/harp-webtile-datasource/package.json
@@ -33,7 +33,7 @@
     "devDependencies": {
         "@types/chai": "^4.2.14",
         "@types/mocha": "^8.2.0",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "chai": "^4.0.2",
         "copyfiles": "^2.2.0",
         "cross-env": "^7.0.2",
@@ -42,7 +42,7 @@
         "typescript": "^4.1.2"
     },
     "peerDependencies": {
-        "three": "^0.127.0"
+        "three": "^0.129.0"
     },
     "publishConfig": {
         "access": "public"
diff --git a/@here/harp.gl/package.json b/@here/harp.gl/package.json
index 469b98c54b..bec6bb94dc 100644
--- a/@here/harp.gl/package.json
+++ b/@here/harp.gl/package.json
@@ -31,7 +31,7 @@
     },
     "license": "Apache-2.0",
     "dependencies": {
-        "three": "^0.127.0"
+        "three": "^0.129.0"
     },
     "devDependencies": {
         "@here/harp-datasource-protocol": "^0.25.0",
@@ -53,7 +53,7 @@
         "@here/harp-vectortile-datasource": "^0.25.0",
         "@here/harp-webtile-datasource": "^0.25.0",
         "@microsoft/api-extractor": "^7.8.10",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "ts-loader": "^8.0.7",
         "typescript": "^4.1.2",
         "webpack": "^5.12.3",
diff --git a/package.json b/package.json
index 75a217fa16..d4b486fefb 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
         "@types/glob": "^7.1.3",
         "@types/semver": "^7.3.4",
         "@types/stats.js": "^0.17.0",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "@typescript-eslint/eslint-plugin": "^4.11.1",
         "@typescript-eslint/parser": "^4.11.1",
         "chai": "^4.2.0",
@@ -38,7 +38,7 @@
         "fs-extra": "^9.0.0",
         "geckodriver": "^1.21.1",
         "glob": "^7.1.4",
-        "karma": "^5.2.3",
+        "karma": "^6.3.2",
         "karma-chrome-launcher": "^3.1.0",
         "karma-coverage-istanbul-reporter": "^3.0.3",
         "karma-firefox-launcher": "^2.1.0",
@@ -51,7 +51,7 @@
         "nyc": "^15.0.1",
         "prettier": "^2.2.1",
         "semver": "^7.3.2",
-        "three": "^0.127.0",
+        "three": "^0.129.0",
         "ts-mocha": "^8.0.0",
         "typedoc": "^0.17.7",
         "typescript": "^4.1.2",
diff --git a/test/performance/OmvDecoderPerformanceTest.ts b/test/performance/OmvDecoderPerformanceTest.ts
index 464556bb52..9811b37b23 100644
--- a/test/performance/OmvDecoderPerformanceTest.ts
+++ b/test/performance/OmvDecoderPerformanceTest.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Theme } from "@here/harp-datasource-protocol";
+import { Theme, ValueMap } from "@here/harp-datasource-protocol";
 import { MapEnv, StyleSetEvaluator } from "@here/harp-datasource-protocol/index-decoder";
 import { apikey } from "@here/harp-examples/config";
 import {
@@ -115,40 +115,41 @@ export function createOMVDecoderPerformanceTest(
             });
 
             const geometryProcessor: IGeometryProcessor = {
-                storageLevelOffset: 0,
-
                 processPointFeature(
                     layerName: string,
-                    layerExtents: number,
+                    tileExtents: number,
                     geometry: THREE.Vector3[],
-                    env: MapEnv
+                    properties: ValueMap
                 ) {
+                    const env = new MapEnv(properties);
                     styleSetEvaluator.getMatchingTechniques(env, layerName, "point");
                 },
                 processLineFeature(
                     layerName: string,
-                    layerExtents: number,
+                    tileExtents: number,
                     geometry: ILineGeometry[],
-                    env: MapEnv
+                    properties: ValueMap
                 ) {
+                    const env = new MapEnv(properties);
                     styleSetEvaluator.getMatchingTechniques(env, layerName, "line");
                 },
 
                 processPolygonFeature(
                     layerName: string,
-                    layerExtents: number,
+                    tileExtents: number,
                     geometry: IPolygonGeometry[],
-                    env: MapEnv
+                    properties: ValueMap
                 ) {
+                    const env = new MapEnv(properties);
                     styleSetEvaluator.getMatchingTechniques(env, layerName, "polygon");
                 }
             };
 
             await measurePerformanceSync(counterName, repeats, function () {
                 for (const [tileKey, tileData] of omvTiles) {
-                    const decoder = new OmvDataAdapter(geometryProcessor, undefined);
-                    const decodeInfo = new DecodeInfo("profiler", mercatorProjection, tileKey, 0);
-                    decoder.process(tileData, decodeInfo);
+                    const decoder = new OmvDataAdapter();
+                    const decodeInfo = new DecodeInfo(mercatorProjection, tileKey, 0);
+                    decoder.process(tileData, decodeInfo, geometryProcessor);
                 }
             });
         });
@@ -167,11 +168,12 @@ export function createOMVDecoderPerformanceTest(
             await measurePerformanceSync(counterName, repeats, function () {
                 for (const [tileKey, tileData] of omvTiles) {
                     const decoder = new VectorTileDataProcessor(
+                        tileKey,
                         projection,
                         styleSetEvaluator,
-                        false
+                        new OmvDataAdapter()
                     );
-                    decoder.getDecodedTile(tileKey, tileData);
+                    decoder.getDecodedTile(tileData);
                 }
             });
         });
@@ -191,11 +193,12 @@ export function createOMVDecoderPerformanceTest(
             await measurePerformanceSync(counterName, repeats, function () {
                 for (const [tileKey, tileData] of omvTiles) {
                     const decoder = new VectorTileDataProcessor(
+                        tileKey,
                         projection,
                         styleSetEvaluator,
-                        false
+                        new OmvDataAdapter()
                     );
-                    decoder.getDecodedTile(tileKey, tileData);
+                    decoder.getDecodedTile(tileData);
                 }
             });
         });
diff --git a/test/performance/package.json b/test/performance/package.json
index 675d95a8ce..7ceeda9bea 100644
--- a/test/performance/package.json
+++ b/test/performance/package.json
@@ -15,9 +15,9 @@
         "@here/harp-test-utils": "^0.25.0",
         "@here/harp-vectortile-datasource": "^0.25.0",
         "@types/chai": "^4.2.14",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "chai": "^4.2.0",
-        "three": "^0.127.0"
+        "three": "^0.129.0"
     },
     "license": "Apache-2.0"
 }
diff --git a/test/rendering/GeoJsonDataRendering.ts b/test/rendering/GeoJsonDataRendering.ts
index f55f7eeff7..72b9c080ce 100644
--- a/test/rendering/GeoJsonDataRendering.ts
+++ b/test/rendering/GeoJsonDataRendering.ts
@@ -100,7 +100,7 @@ describe("MapView + OmvDataSource + GeoJsonDataProvider rendering test", functio
                 color: "#BC002D",
                 // This causes the bug HARP-12247
                 enabled: ["get", "enabled", ["dynamic-properties"]],
-                size: 150
+                size: ["get", "size", ["dynamic-properties"]]
             }
         ];
 
@@ -108,7 +108,8 @@ describe("MapView + OmvDataSource + GeoJsonDataProvider rendering test", functio
             mochaTest: this,
             testImageName: "geojson-point-enabled-as-dynamic-expression",
             theme: { lights, styles: { geojson: greenStyle } },
-            geoJson: "../dist/resources/basic_polygon.json"
+            geoJson: "../dist/resources/basic_polygon.json",
+            size: 150
         });
     });
     it("renders extruded polygons with height", async function () {
diff --git a/test/rendering/StylingTest.ts b/test/rendering/StylingTest.ts
index 7cfeb4adda..a40dc55b8b 100644
--- a/test/rendering/StylingTest.ts
+++ b/test/rendering/StylingTest.ts
@@ -18,7 +18,6 @@ import {
     SolidLineStyle,
     Style,
     TextTechniqueStyle,
-    TextureBuffer,
     TextureCoordinateType,
     Theme,
     Value
@@ -28,7 +27,6 @@ import { GeoBox, OrientedBox3, ProjectionType } from "@here/harp-geoutils";
 import { LookAtParams, MapAnchor, MapView, MapViewEventNames } from "@here/harp-mapview";
 import { GeoJsonTiler } from "@here/harp-mapview-decoder/index-worker";
 import { getPlatform, RenderingTestHelper, TestOptions, waitForEvent } from "@here/harp-test-utils";
-import { loadImageData } from "@here/harp-test-utils/lib/rendering/DomImageUtils";
 import { getReferenceImageUrl } from "@here/harp-test-utils/lib/rendering/ReferenceImageLocator";
 import { getOptionValue } from "@here/harp-utils";
 import { VectorTileDecoder } from "@here/harp-vectortile-datasource/index-worker";
@@ -62,6 +60,7 @@ function baseRenderingTest(
         // will try to resolve this promise and report failure in test context.
     });
     it(name, async function () {
+        this.timeout(100000);
         let canvas: HTMLCanvasElement | undefined;
         // TODO: remove `module` name from RenderingTestHalper API
         try {
@@ -878,27 +877,14 @@ describe("MapView Styling Test", function () {
                 });
             });
             describe("textured", function () {
-                const textureBuffer = {} as TextureBuffer;
-
-                this.beforeAll(async () => {
-                    // HARP-15210: Frame complete event does not wait for textures to be
-                    // loaded. In the meantime preload the texture buffer here to ensure
-                    // the texture is rendered at frame complete.
-                    const imageData = await loadImageData("../dist/resources/radar.png");
-                    textureBuffer.buffer = imageData.data.buffer;
-                    textureBuffer.type = "image/raw";
-                    textureBuffer.dataTextureProperties = {
-                        width: imageData.width,
-                        height: imageData.height
-                    };
-                });
+                const textureUrl = "../dist/resources/radar.png";
                 makePolygonTestCases(
                     "fill",
                     {
                         "fill-texture-feature-space": {
                             color: "#ffffff",
-                            map: textureBuffer,
-                            mapProperties: { flipY: true },
+                            map: textureUrl,
+                            mapProperties: { flipY: true, minFilter: "linear" },
                             transparent: true,
                             textureCoordinateType: TextureCoordinateType.FeatureSpace,
                             enabled: ["match", ["get", "name"], "Awesome Building", true, false]
@@ -906,14 +892,14 @@ describe("MapView Styling Test", function () {
                         "fill-texture-dynamic": {
                             color: "#ffffff",
                             map: ["get", "dynamic-texture", ["dynamic-properties"]],
-                            mapProperties: { flipY: true },
+                            mapProperties: { flipY: true, minFilter: "linear" },
                             transparent: true,
                             textureCoordinateType: TextureCoordinateType.FeatureSpace,
                             enabled: ["match", ["get", "name"], "Awesome Building", true, false]
                         }
                     },
                     {
-                        dynamicProperties: [{ name: "dynamic-texture", value: textureBuffer }]
+                        dynamicProperties: [{ name: "dynamic-texture", value: textureUrl }]
                     }
                 );
             });
diff --git a/test/rendering/package.json b/test/rendering/package.json
index c41d60ae12..3b5cb2675a 100644
--- a/test/rendering/package.json
+++ b/test/rendering/package.json
@@ -18,9 +18,9 @@
         "@here/harp-utils": "^0.25.0",
         "@here/harp-vectortile-datasource": "^0.25.0",
         "@types/chai": "^4.2.14",
-        "@types/three": "^0.127.0",
+        "@types/three": "^0.129.0",
         "chai": "^4.2.0",
-        "three": "^0.127.0"
+        "three": "^0.129.0"
     },
     "license": "Apache-2.0"
 }
diff --git a/test/rendering/utils/GeoJsonTest.ts b/test/rendering/utils/GeoJsonTest.ts
index f29c56f8a6..81f8315c56 100644
--- a/test/rendering/utils/GeoJsonTest.ts
+++ b/test/rendering/utils/GeoJsonTest.ts
@@ -29,6 +29,7 @@ export interface GeoJsonTestOptions extends GeoJsonDataSourceTestOptions {
     dataProvider?: DataProvider;
     extraDataSource?: GeoJsonDataSourceTestOptions;
     beforeFinishCallback?: (mapView: MapView) => void;
+    size?: number;
 }
 
 function createDataSource(
@@ -102,6 +103,9 @@ export class GeoJsonTest {
         const dataSource = createDataSource("geojson", options);
 
         this.mapView.setDynamicProperty("enabled", true);
+        if (options.size) {
+            this.mapView.setDynamicProperty("size", options.size);
+        }
         await this.mapView.addDataSource(dataSource);
 
         if (options.extraDataSource) {
diff --git a/www/package.json b/www/package.json
index 94df483dcb..3416628cda 100644
--- a/www/package.json
+++ b/www/package.json
@@ -29,7 +29,7 @@
         "mini-css-extract-plugin": "^1.3.2",
         "node-fetch": "^2.6.1",
         "script-ext-html-webpack-plugin": "^2.1.4",
-        "three": "^0.127.0",
+        "three": "^0.129.0",
         "ts-loader": "^8.0.7",
         "typescript": "^4.1.2",
         "webpack": "^5.12.3",
diff --git a/yarn.lock b/yarn.lock
index ebd49a19d9..7cd76aa907 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -298,14 +298,6 @@
   resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.12.19.tgz#2173ccb92469aaf62031fa9499d21b16d07f9b57"
   integrity sha512-IpgPxHrNxZiMNUSXqR1l/gePKPkfAmIKoDRP9hp7OwjU29ZR8WCJsOJ8iBKgw0Qk+pFwR+8Y1cy8ImLY6e9m4A==
 
-"@mrmlnc/readdir-enhanced@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
-  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
-  dependencies:
-    call-me-maybe "^1.0.1"
-    glob-to-regexp "^0.3.0"
-
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
@@ -319,11 +311,6 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
   integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
 
-"@nodelib/fs.stat@^1.1.2":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
-  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
-
 "@nodelib/fs.walk@^1.2.3":
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
@@ -332,6 +319,217 @@
     "@nodelib/fs.scandir" "2.1.3"
     fastq "^1.6.0"
 
+"@npmcli/arborist@^2.2.2":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-2.6.0.tgz#8006d1a60435199db6ee72d4c0772869bb75557a"
+  integrity sha512-6njRVuPMgGRvQUmsXwGdp1ItZtJuSdt5ouoQe4AeFTTZoMufKWLeXFDOlWj7qbMAzqw+guNEAZwBiwm04J7T2g==
+  dependencies:
+    "@npmcli/installed-package-contents" "^1.0.7"
+    "@npmcli/map-workspaces" "^1.0.2"
+    "@npmcli/metavuln-calculator" "^1.1.0"
+    "@npmcli/move-file" "^1.1.0"
+    "@npmcli/name-from-folder" "^1.0.1"
+    "@npmcli/node-gyp" "^1.0.1"
+    "@npmcli/run-script" "^1.8.2"
+    bin-links "^2.2.1"
+    cacache "^15.0.3"
+    common-ancestor-path "^1.0.1"
+    json-parse-even-better-errors "^2.3.1"
+    json-stringify-nice "^1.1.4"
+    mkdirp-infer-owner "^2.0.0"
+    npm-install-checks "^4.0.0"
+    npm-package-arg "^8.1.0"
+    npm-pick-manifest "^6.1.0"
+    npm-registry-fetch "^10.0.0"
+    pacote "^11.2.6"
+    parse-conflict-json "^1.1.1"
+    promise-all-reject-late "^1.0.0"
+    promise-call-limit "^1.0.1"
+    read-package-json-fast "^2.0.2"
+    readdir-scoped-modules "^1.1.0"
+    semver "^7.3.5"
+    tar "^6.1.0"
+    treeverse "^1.0.4"
+    walk-up-path "^1.0.0"
+
+"@npmcli/git@^2.0.1":
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.0.9.tgz#915bbfe66300e67b4da5ef765a4475ffb2ca5b6b"
+  integrity sha512-hTMbMryvOqGLwnmMBKs5usbPsJtyEsMsgXwJbmNrsEuQQh1LAIMDU77IoOrwkCg+NgQWl+ySlarJASwM3SutCA==
+  dependencies:
+    "@npmcli/promise-spawn" "^1.3.2"
+    lru-cache "^6.0.0"
+    mkdirp "^1.0.4"
+    npm-pick-manifest "^6.1.1"
+    promise-inflight "^1.0.1"
+    promise-retry "^2.0.1"
+    semver "^7.3.5"
+    which "^2.0.2"
+
+"@npmcli/installed-package-contents@^1.0.6", "@npmcli/installed-package-contents@^1.0.7":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
+  integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
+  dependencies:
+    npm-bundled "^1.1.1"
+    npm-normalize-package-bin "^1.0.1"
+
+"@npmcli/map-workspaces@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-1.0.3.tgz#6072a0794762cf8f572e6080fa66d1bbefa991d5"
+  integrity sha512-SdlRlOoQw4WKD4vtb/n5gUkobEABYBEOo8fRE4L8CtBkyWDSvIrReTfKvQ/Jc/LQqDaaZ5iv1iMSQzKCUr1n1A==
+  dependencies:
+    "@npmcli/name-from-folder" "^1.0.1"
+    glob "^7.1.6"
+    minimatch "^3.0.4"
+    read-package-json-fast "^2.0.1"
+
+"@npmcli/metavuln-calculator@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-1.1.1.tgz#2f95ff3c6d88b366dd70de1c3f304267c631b458"
+  integrity sha512-9xe+ZZ1iGVaUovBVFI9h3qW+UuECUzhvZPxK9RaEA2mjU26o5D0JloGYWwLYvQELJNmBdQB6rrpuN8jni6LwzQ==
+  dependencies:
+    cacache "^15.0.5"
+    pacote "^11.1.11"
+    semver "^7.3.2"
+
+"@npmcli/move-file@^1.0.1", "@npmcli/move-file@^1.1.0":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
+  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
+  dependencies:
+    mkdirp "^1.0.4"
+    rimraf "^3.0.2"
+
+"@npmcli/name-from-folder@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/name-from-folder/-/name-from-folder-1.0.1.tgz#77ecd0a4fcb772ba6fe927e2e2e155fbec2e6b1a"
+  integrity sha512-qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA==
+
+"@npmcli/node-gyp@^1.0.1", "@npmcli/node-gyp@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz#3cdc1f30e9736dbc417373ed803b42b1a0a29ede"
+  integrity sha512-yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg==
+
+"@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5"
+  integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==
+  dependencies:
+    infer-owner "^1.0.4"
+
+"@npmcli/run-script@^1.8.2":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.5.tgz#f250a0c5e1a08a792d775a315d0ff42fc3a51e1d"
+  integrity sha512-NQspusBCpTjNwNRFMtz2C5MxoxyzlbuJ4YEhxAKrIonTiirKDtatsZictx9RgamQIx6+QuHMNmPl0wQdoESs9A==
+  dependencies:
+    "@npmcli/node-gyp" "^1.0.2"
+    "@npmcli/promise-spawn" "^1.3.2"
+    infer-owner "^1.0.4"
+    node-gyp "^7.1.0"
+    read-package-json-fast "^2.0.1"
+
+"@octokit/auth-token@^2.4.4":
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.5.tgz#568ccfb8cb46f36441fac094ce34f7a875b197f3"
+  integrity sha512-BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA==
+  dependencies:
+    "@octokit/types" "^6.0.3"
+
+"@octokit/core@^3.2.3":
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.4.0.tgz#b48aa27d755b339fe7550548b340dcc2b513b742"
+  integrity sha512-6/vlKPP8NF17cgYXqucdshWqmMZGXkuvtcrWCgU5NOI0Pl2GjlmZyWgBMrU8zJ3v2MJlM6++CiB45VKYmhiWWg==
+  dependencies:
+    "@octokit/auth-token" "^2.4.4"
+    "@octokit/graphql" "^4.5.8"
+    "@octokit/request" "^5.4.12"
+    "@octokit/request-error" "^2.0.5"
+    "@octokit/types" "^6.0.3"
+    before-after-hook "^2.2.0"
+    universal-user-agent "^6.0.0"
+
+"@octokit/endpoint@^6.0.1":
+  version "6.0.11"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.11.tgz#082adc2aebca6dcefa1fb383f5efb3ed081949d1"
+  integrity sha512-fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ==
+  dependencies:
+    "@octokit/types" "^6.0.3"
+    is-plain-object "^5.0.0"
+    universal-user-agent "^6.0.0"
+
+"@octokit/graphql@^4.5.8":
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.6.2.tgz#ec44abdfa87f2b9233282136ae33e4ba446a04e7"
+  integrity sha512-WmsIR1OzOr/3IqfG9JIczI8gMJUMzzyx5j0XXQ4YihHtKlQc+u35VpVoOXhlKAlaBntvry1WpAzPl/a+s3n89Q==
+  dependencies:
+    "@octokit/request" "^5.3.0"
+    "@octokit/types" "^6.0.3"
+    universal-user-agent "^6.0.0"
+
+"@octokit/openapi-types@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-7.0.0.tgz#0f6992db9854af15eca77d71ab0ec7fad2f20411"
+  integrity sha512-gV/8DJhAL/04zjTI95a7FhQwS6jlEE0W/7xeYAzuArD0KVAVWDLP2f3vi98hs3HLTczxXdRK/mF0tRoQPpolEw==
+
+"@octokit/plugin-paginate-rest@^2.6.2":
+  version "2.13.3"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.3.tgz#f0f1792230805108762d87906fb02d573b9e070a"
+  integrity sha512-46lptzM9lTeSmIBt/sVP/FLSTPGx6DCzAdSX3PfeJ3mTf4h9sGC26WpaQzMEq/Z44cOcmx8VsOhO+uEgE3cjYg==
+  dependencies:
+    "@octokit/types" "^6.11.0"
+
+"@octokit/plugin-request-log@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.3.tgz#70a62be213e1edc04bb8897ee48c311482f9700d"
+  integrity sha512-4RFU4li238jMJAzLgAwkBAw+4Loile5haQMQr+uhFq27BmyJXcXSKvoQKqh0agsZEiUlW6iSv3FAgvmGkur7OQ==
+
+"@octokit/plugin-rest-endpoint-methods@5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.0.1.tgz#631b8d4edc6798b03489911252a25f2a4e58c594"
+  integrity sha512-vvWbPtPqLyIzJ7A4IPdTl+8IeuKAwMJ4LjvmqWOOdfSuqWQYZXq2CEd0hsnkidff2YfKlguzujHs/reBdAx8Sg==
+  dependencies:
+    "@octokit/types" "^6.13.1"
+    deprecation "^2.3.1"
+
+"@octokit/request-error@^2.0.0", "@octokit/request-error@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.5.tgz#72cc91edc870281ad583a42619256b380c600143"
+  integrity sha512-T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg==
+  dependencies:
+    "@octokit/types" "^6.0.3"
+    deprecation "^2.0.0"
+    once "^1.4.0"
+
+"@octokit/request@^5.3.0", "@octokit/request@^5.4.12":
+  version "5.4.15"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.15.tgz#829da413dc7dd3aa5e2cdbb1c7d0ebe1f146a128"
+  integrity sha512-6UnZfZzLwNhdLRreOtTkT9n57ZwulCve8q3IT/Z477vThu6snfdkBuhxnChpOKNGxcQ71ow561Qoa6uqLdPtag==
+  dependencies:
+    "@octokit/endpoint" "^6.0.1"
+    "@octokit/request-error" "^2.0.0"
+    "@octokit/types" "^6.7.1"
+    is-plain-object "^5.0.0"
+    node-fetch "^2.6.1"
+    universal-user-agent "^6.0.0"
+
+"@octokit/rest@^18.0.6":
+  version "18.5.3"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.5.3.tgz#6a2e6006a87ebbc34079c419258dd29ec9ff659d"
+  integrity sha512-KPAsUCr1DOdLVbZJgGNuE/QVLWEaVBpFQwDAz/2Cnya6uW2wJ/P5RVGk0itx7yyN1aGa8uXm2pri4umEqG1JBA==
+  dependencies:
+    "@octokit/core" "^3.2.3"
+    "@octokit/plugin-paginate-rest" "^2.6.2"
+    "@octokit/plugin-request-log" "^1.0.2"
+    "@octokit/plugin-rest-endpoint-methods" "5.0.1"
+
+"@octokit/types@^6.0.3", "@octokit/types@^6.11.0", "@octokit/types@^6.13.1", "@octokit/types@^6.7.1":
+  version "6.14.2"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.14.2.tgz#64c9457f38fb8522bdbba3c8cc814590a2d61bf5"
+  integrity sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==
+  dependencies:
+    "@octokit/openapi-types" "^7.0.0"
+
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
@@ -430,6 +628,15 @@
     lodash.get "^4.4.2"
     type-detect "^4.0.8"
 
+"@sinonjs/samsam@^5.3.1":
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.1.tgz#375a45fe6ed4e92fca2fb920e007c48232a6507f"
+  integrity sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==
+  dependencies:
+    "@sinonjs/commons" "^1.6.0"
+    lodash.get "^4.4.2"
+    type-detect "^4.0.8"
+
 "@sinonjs/text-encoding@^0.7.1":
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
@@ -442,6 +649,11 @@
   dependencies:
     highlight.js "^9.15.6"
 
+"@tootallnate/once@1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
+  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+
 "@turf/along@5.1.x":
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/@turf/along/-/along-5.1.5.tgz#61d6e6a6584acddab56ac5584e07bf8cbe5f8beb"
@@ -1651,6 +1863,11 @@
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
+"@types/component-emitter@^1.2.10":
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.10.tgz#ef5b1589b9f16544642e473db5ea5639107ef3ea"
+  integrity sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg==
+
 "@types/connect@*":
   version "3.4.33"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546"
@@ -1658,6 +1875,16 @@
   dependencies:
     "@types/node" "*"
 
+"@types/cookie@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.0.tgz#14f854c0f93d326e39da6e3b6f34f7d37513d108"
+  integrity sha512-y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg==
+
+"@types/cors@^2.8.8":
+  version "2.8.10"
+  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.10.tgz#61cc8469849e5bcdd0c7044122265c39cec10cf4"
+  integrity sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ==
+
 "@types/dat.gui@^0.7.1":
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/@types/dat.gui/-/dat.gui-0.7.5.tgz#8f4f87300ae553a57b246a7bf1b9fe5e13ca8b79"
@@ -1785,6 +2012,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.13.tgz#ccebcdb990bd6139cd16e84c39dc2fb1023ca90c"
   integrity sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==
 
+"@types/node@>=10.0.0":
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.3.1.tgz#23a06b87eedb524016616e886b116b8fdcb180af"
+  integrity sha512-weaeiP4UF4XgF++3rpQhpIJWsCTS4QJw5gvBhQu6cFIxTwyxWIe3xbnrY/o2lTCQ0lsdb8YIUDUvLR4Vuz5rbw==
+
 "@types/node@^13.7.0":
   version "13.13.15"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.15.tgz#fe1cc3aa465a3ea6858b793fd380b66c39919766"
@@ -1847,10 +2079,10 @@
   resolved "https://registry.yarnpkg.com/@types/stats.js/-/stats.js-0.17.0.tgz#0ed81d48e03b590c24da85540c1d952077a9fe20"
   integrity sha512-9w+a7bR8PeB0dCT/HBULU2fMqf6BAzvKbxFboYhmDtDkKPiyXYbjoe2auwsXlEFI7CFNMF1dCv3dFH5Poy9R1w==
 
-"@types/three@^0.127.0":
-  version "0.127.0"
-  resolved "https://registry.yarnpkg.com/@types/three/-/three-0.127.0.tgz#6d2bf6d7c14d4c4dc399a0e355085f27e996ac89"
-  integrity sha512-4Q33L6PzzxCXm0VdUv4x1/4VBnwWgCS7Ui6WpRh88GVIUUYsg5qU2GVzva14hDJbtfyNBxey7UcdInR4RkKPeQ==
+"@types/three@^0.129.0":
+  version "0.129.1"
+  resolved "https://registry.yarnpkg.com/@types/three/-/three-0.129.1.tgz#e488e686132256dfd61cffd4d97ea6cf176a4a8d"
+  integrity sha512-31VTcjAQNggIrCH9NVotTYsr5Ws/QMGGTaMK6RP3EgyzW2WEuZdm25TNidd6PJ3e4a6/hbswNacnTsjwc7ksbw==
 
 "@types/ua-parser-js@^0.7.32":
   version "0.7.33"
@@ -2087,13 +2319,10 @@
   resolved "https://registry.yarnpkg.com/@zbigg/treesync/-/treesync-0.3.0.tgz#59f5366d4c6addf07cef385ede15b953b7f9c96a"
   integrity sha512-C4o9Dcq2cgWfFiLPTzUyHBMh8+9K0vCfS7Z06a5oh4AosIVGakpG5rb+Hu9UwZmwUE3gwHf5Ps4UPd3EGyCpCA==
 
-JSONStream@^1.2.1, JSONStream@^1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
-  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
-  dependencies:
-    jsonparse "^1.2.0"
-    through ">=2.2.7 <3"
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
   version "1.3.7"
@@ -2133,23 +2362,27 @@ adm-zip@0.4.16, adm-zip@~0.4.3:
   resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.16.tgz#cf4c508fdffab02c269cbc7f471a875f05570365"
   integrity sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==
 
-after@0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
-  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
-
 agent-base@5:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
   integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
 
 agent-base@6:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.1.tgz#808007e4e5867decb0ab6ab2f928fbdb5a596db4"
-  integrity sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
   dependencies:
     debug "4"
 
+agentkeepalive@^4.1.3:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b"
+  integrity sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==
+  dependencies:
+    debug "^4.1.0"
+    depd "^1.1.2"
+    humanize-ms "^1.2.1"
+
 aggregate-error@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0"
@@ -2290,7 +2523,7 @@ archy@^1.0.0:
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
   integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
 
-are-we-there-yet@~1.1.2:
+are-we-there-yet@^1.1.5, are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
   integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
@@ -2354,7 +2587,7 @@ array-includes@^3.1.1:
     es-abstract "^1.17.0"
     is-string "^1.0.5"
 
-array-union@^1.0.1, array-union@^1.0.2:
+array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
   integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
@@ -2384,12 +2617,7 @@ array.prototype.flat@^1.2.3:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
-arraybuffer.slice@~0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
-  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
-
-arrify@^1.0.0, arrify@^1.0.1:
+arrify@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
@@ -2399,6 +2627,11 @@ arrify@^2.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
   integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
 
+asap@^2.0.0:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
+
 asn1.js@^5.2.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
@@ -2505,19 +2738,6 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428"
   integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==
 
-axios@^0.18.0:
-  version "0.18.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3"
-  integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==
-  dependencies:
-    follow-redirects "1.5.10"
-    is-buffer "^2.0.2"
-
-backo2@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -2528,11 +2748,6 @@ base64-arraybuffer@0.1.4:
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
   integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
 
-base64-arraybuffer@0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
-  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
-
 base64-js@^1.0.2:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
@@ -2543,7 +2758,7 @@ base64-js@^1.3.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-base64id@2.0.0:
+base64id@2.0.0, base64id@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
   integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
@@ -2573,12 +2788,10 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-better-assert@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
-  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
-  dependencies:
-    callsite "1.0.0"
+before-after-hook@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.1.tgz#73540563558687586b52ed217dad6a802ab1549c"
+  integrity sha512-/6FKxSTWoJdbsLDF8tdIjaRiFXiE6UHsEHE3OPI/cwPURCVi1ukP0gmLn7XWEiFk5TcwQjjY5PWsU+j+tgXgmw==
 
 big.js@^5.2.2:
   version "5.2.2"
@@ -2590,6 +2803,18 @@ bignumber.js@^2.1.0:
   resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-2.4.0.tgz#838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"
   integrity sha1-g4qZLan51zfg9LLbC+YrsJ3Qxeg=
 
+bin-links@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-2.2.1.tgz#347d9dbb48f7d60e6c11fe68b77a424bee14d61b"
+  integrity sha512-wFzVTqavpgCCYAh8SVBdnZdiQMxTkGR+T3b14CNpBXIBe2neJWaMGAZ55XWWHELJJ89dscuq0VCBqcVaIOgCMg==
+  dependencies:
+    cmd-shim "^4.0.1"
+    mkdirp "^1.0.3"
+    npm-normalize-package-bin "^1.0.0"
+    read-cmd-shim "^2.0.0"
+    rimraf "^3.0.0"
+    write-file-atomic "^3.0.3"
+
 bin-pack@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bin-pack/-/bin-pack-1.0.2.tgz#c2a014edbf0bed70a3292062ed46577b96120679"
@@ -2605,10 +2830,10 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9"
   integrity sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==
 
-binaryextensions@^2.1.2:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.3.0.tgz#1d269cbf7e6243ea886aa41453c3651ccbe13c22"
-  integrity sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==
+binaryextensions@^4.15.0:
+  version "4.15.0"
+  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-4.15.0.tgz#c63a502e0078ff1b0e9b00a9f74d3c2b0f8bd32e"
+  integrity sha512-MkUl3szxXolQ2scI1PM14WOT951KnaTNJ0eMKg7WzOI4kvSxyNo/Cygx4LOBNhwyINhAuSQpJW1rYD9aBSxGaw==
 
 bindings@^1.5.0:
   version "1.5.0"
@@ -2626,11 +2851,6 @@ bl@^4.0.1:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-blob@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
-  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
-
 bluebird@3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -2794,15 +3014,15 @@ browserify-zlib@^0.2.0:
     pako "~1.0.5"
 
 browserslist@^4.14.5:
-  version "4.15.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.15.0.tgz#3d48bbca6a3f378e86102ffd017d9a03f122bdb0"
-  integrity sha512-IJ1iysdMkGmjjYeRlDU8PQejVwxvVO5QOfXH7ylW31GO6LwNRSmm/SgRXtNsEXqMLl2e+2H5eEJ7sfynF8TCaQ==
+  version "4.16.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
+  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
   dependencies:
-    caniuse-lite "^1.0.30001164"
-    colorette "^1.2.1"
-    electron-to-chromium "^1.3.612"
+    caniuse-lite "^1.0.30001219"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.723"
     escalade "^3.1.1"
-    node-releases "^1.1.67"
+    node-releases "^1.1.71"
 
 buffer-crc32@~0.2.3:
   version "0.2.13"
@@ -2850,6 +3070,11 @@ builtin-status-codes@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
+
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -2860,6 +3085,29 @@ bytes@3.1.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
+cacache@^15.0.3, cacache@^15.0.5:
+  version "15.1.0"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.1.0.tgz#164c2f857ee606e4cc793c63018fefd0ea5eba7b"
+  integrity sha512-mfx0C+mCfWjD1PnwQ9yaOrwG1ou9FkKnx0SvzUHWdFt7r7GaRtzT+9M8HAvLu62zIHtnpQ/1m93nWNDCckJGXQ==
+  dependencies:
+    "@npmcli/move-file" "^1.0.1"
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    glob "^7.1.4"
+    infer-owner "^1.0.4"
+    lru-cache "^6.0.0"
+    minipass "^3.1.1"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.2"
+    mkdirp "^1.0.3"
+    p-map "^4.0.0"
+    promise-inflight "^1.0.1"
+    rimraf "^3.0.2"
+    ssri "^8.0.1"
+    tar "^6.0.2"
+    unique-filename "^1.1.1"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -2893,16 +3141,6 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
-call-me-maybe@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
-  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
-
-callsite@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
-  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
-
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -2926,10 +3164,10 @@ camelcase@^6.0.0, camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
   integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
-caniuse-lite@^1.0.30001164:
-  version "1.0.30001165"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz#32955490d2f60290bb186bb754f2981917fa744f"
-  integrity sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA==
+caniuse-lite@^1.0.30001219:
+  version "1.0.30001228"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
+  integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
 
 capture-stack-trace@^1.0.0:
   version "1.0.1"
@@ -2960,7 +3198,7 @@ chai@^4.0.2, chai@^4.1.2, chai@^4.2.0:
     pathval "^1.1.0"
     type-detect "^4.0.5"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -3084,9 +3322,9 @@ cli-cursor@^3.1.0:
     restore-cursor "^3.1.0"
 
 cli-table@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
-  integrity sha1-9TsFJmqLGguTSz0IIebi3FkUriM=
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.6.tgz#e9d6aa859c7fe636981fd3787378c2a20bce92fc"
+  integrity sha512-ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ==
   dependencies:
     colors "1.0.3"
 
@@ -3113,6 +3351,15 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
 clone-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
@@ -3156,6 +3403,13 @@ cloneable-readable@^1.0.0:
     process-nextick-args "^2.0.0"
     readable-stream "^2.3.5"
 
+cmd-shim@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-4.1.0.tgz#b3a904a6743e9fede4148c6f3800bf2a08135bdd"
+  integrity sha512-lb9L7EM4I/ZRVuljLPEtUJOP+xiQVknZ4ZMpMgEp4JzNldPb27HU03hi6K1/6CoIuit/Zm/LQXySErFeXxDprw==
+  dependencies:
+    mkdirp-infer-owner "^2.0.0"
+
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -3209,10 +3463,10 @@ color@^3.1.2:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
-colorette@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
-  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
+colorette@^1.2.1, colorette@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
 
 colors@1.0.3:
   version "1.0.3"
@@ -3251,6 +3505,11 @@ commander@2, commander@^2.20.0, commander@^2.7.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
+commander@7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff"
+  integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==
+
 commander@^4.0.1, commander@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
@@ -3266,31 +3525,21 @@ commander@^6.2.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75"
   integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==
 
+common-ancestor-path@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7"
+  integrity sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
-component-bind@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
-  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
-
-component-emitter@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
-
 component-emitter@^1.2.1, component-emitter@~1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
-component-inherit@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
-  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
-
 compressible@~2.0.16:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
@@ -3416,16 +3665,16 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
-cookie@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
-
 cookie@0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
   integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
 
+cookie@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
+  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
+
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
@@ -3462,6 +3711,14 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
+cors@~2.8.5:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
+  dependencies:
+    object-assign "^4"
+    vary "^1"
+
 cosmiconfig@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
@@ -3481,7 +3738,7 @@ create-ecdh@^4.0.0:
     bn.js "^4.1.0"
     elliptic "^6.5.3"
 
-create-error-class@^3.0.0, create-error-class@^3.0.1:
+create-error-class@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
   integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
@@ -3523,7 +3780,7 @@ cross-env@^7.0.2:
   dependencies:
     cross-spawn "^7.0.1"
 
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -3632,10 +3889,10 @@ d3-voronoi@1.1.2:
   resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.2.tgz#1687667e8f13a2d158c80c1480c5a29cb0d8973c"
   integrity sha1-Fodmfo8TotFYyAwUgMWinLDYlzw=
 
-dargs@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/dargs/-/dargs-6.1.0.tgz#1f3b9b56393ecf8caa7cbfd6c31496ffcfb9b272"
-  integrity sha512-5dVBvpBLBnPwSsYXqfybFyehMmC/EenKEcf23AhCTgTf48JFBbmJKqoZBsERDnjL0FyiVTYWdFsRfTLHxLyKdQ==
+dargs@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc"
+  integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==
 
 dashdash@^1.12.0:
   version "1.14.1"
@@ -3664,10 +3921,10 @@ date-format@^3.0.0:
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-3.0.0.tgz#eb8780365c7d2b1511078fb491e6479780f3ad95"
   integrity sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w==
 
-dateformat@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
-  integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
+dateformat@^4.5.0:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.5.1.tgz#c20e7a9ca77d147906b6dc2261a8be0a5bd2173c"
+  integrity sha512-OD0TZ+B7yP7ZgpJf5K2DIbj3FZvFvxgFUuaqA/V5zTjAtAAXZ1E8bktHxmAGs4x5b7PflqA9LeQ84Og7wYtF7Q==
 
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   version "2.6.9"
@@ -3683,26 +3940,24 @@ debug@4, debug@4.2.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "2.1.2"
 
-debug@=3.1.0, debug@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.1.0, debug@^3.1.1, debug@^3.2.5:
+debug@^3.1.1, debug@^3.2.5:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
-debug@~4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+debug@~4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
   dependencies:
-    ms "^2.1.1"
+    ms "2.1.2"
+
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
 
 decamelize@^1.2.0:
   version "1.2.0"
@@ -3846,11 +4101,16 @@ density-clustering@1.3.0:
   resolved "https://registry.yarnpkg.com/density-clustering/-/density-clustering-1.3.0.tgz#dc9f59c8f0ab97e1624ac64930fd3194817dcac5"
   integrity sha1-3J9ZyPCrl+FiSsZJMP0xlIF9ysU=
 
-depd@~1.1.2:
+depd@^1.1.2, depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
+deprecation@^2.0.0, deprecation@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
+  integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
+
 des.js@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
@@ -3874,6 +4134,14 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
+dezalgo@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
@@ -3884,11 +4152,16 @@ diff@4.0.2, diff@^4.0.1, diff@^4.0.2:
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
-diff@^3.1.0, diff@^3.5.0:
+diff@^3.1.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
+diff@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
+  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
+
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
@@ -3898,21 +4171,6 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dir-glob@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
-  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
-  dependencies:
-    arrify "^1.0.1"
-    path-type "^3.0.0"
-
-dir-glob@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
-  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
-  dependencies:
-    path-type "^3.0.0"
-
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -3926,9 +4184,9 @@ dns-equal@^1.0.0:
   integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
 
 dns-packet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
-  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f"
+  integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"
@@ -4031,15 +4289,6 @@ dot-case@^3.0.3:
     no-case "^3.0.3"
     tslib "^1.10.0"
 
-download-stats@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/download-stats/-/download-stats-0.3.4.tgz#67ea0c32f14acd9f639da704eef509684ba2dae7"
-  integrity sha512-ic2BigbyUWx7/CBbsfGjf71zUNZB4edBGC3oRliSzsoNmvyVx3Ycfp1w3vp2Y78Ee0eIIkjIEO5KzW0zThDGaA==
-  dependencies:
-    JSONStream "^1.2.1"
-    lazy-cache "^2.0.1"
-    moment "^2.15.1"
-
 duplexer2@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
@@ -4047,11 +4296,6 @@ duplexer2@^0.1.4:
   dependencies:
     readable-stream "^2.0.2"
 
-duplexer3@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
-
 earcut@^2.0.0, earcut@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.2.tgz#41b0bc35f63e0fe80da7cddff28511e7e2e80d11"
@@ -4065,35 +4309,22 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-editions@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/editions/-/editions-2.3.1.tgz#3bc9962f1978e801312fbd0aebfed63b49bfe698"
-  integrity sha512-ptGvkwTvGdGfC0hfhKg0MT+TRLRKGtUiWGBInxOm5pz7ssADezahjCUaYuZ8Dr+C05FW0AECIIPt4WBxVINEhA==
-  dependencies:
-    errlop "^2.0.0"
-    semver "^6.3.0"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-ejs@^2.6.1:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
-  integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
-
-ejs@^3.0.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.3.tgz#514d967a8894084d18d3d47bd169a1c0560f093d"
-  integrity sha512-wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg==
+ejs@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a"
+  integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==
   dependencies:
     jake "^10.6.1"
 
-electron-to-chromium@^1.3.612:
-  version "1.3.619"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.619.tgz#4dc529ae802f5c9c31e7eea830144340539b62b4"
-  integrity sha512-WFGatwtk7Fw0QcKCZzfGD72hvbcXV8kLY8aFuj0Ip0QRnOtyLYMsc+wXbSjb2w4lk1gcAeNU1/lQ20A+tvuypQ==
+electron-to-chromium@^1.3.723:
+  version "1.3.738"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.738.tgz#aec24b091c82acbfabbdcce08076a703941d17ca"
+  integrity sha512-vCMf4gDOpEylPSLPLSwAEsz+R3ShP02Y3cAKMZvTqule3XcPp7tgc/0ESI7IS6ZeyBlGClE50N53fIOkcIVnpw==
 
 elliptic@^6.5.3:
   version "6.5.4"
@@ -4133,6 +4364,13 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
+encoding@^0.1.12:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
+  dependencies:
+    iconv-lite "^0.6.2"
+
 end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -4140,45 +4378,25 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-engine.io-client@~3.4.0:
-  version "3.4.4"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.4.tgz#77d8003f502b0782dd792b073a4d2cf7ca5ab967"
-  integrity sha512-iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ==
-  dependencies:
-    component-emitter "~1.3.0"
-    component-inherit "0.0.3"
-    debug "~3.1.0"
-    engine.io-parser "~2.2.0"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    parseqs "0.0.6"
-    parseuri "0.0.6"
-    ws "~6.1.0"
-    xmlhttprequest-ssl "~1.5.4"
-    yeast "0.1.2"
-
-engine.io-parser@~2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7"
-  integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==
+engine.io-parser@~4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.2.tgz#e41d0b3fb66f7bf4a3671d2038a154024edb501e"
+  integrity sha512-sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg==
   dependencies:
-    after "0.8.2"
-    arraybuffer.slice "~0.0.7"
     base64-arraybuffer "0.1.4"
-    blob "0.0.5"
-    has-binary2 "~1.0.2"
 
-engine.io@~3.4.0:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.2.tgz#8fc84ee00388e3e228645e0a7d3dfaeed5bd122c"
-  integrity sha512-b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg==
+engine.io@~4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-4.1.1.tgz#9a8f8a5ac5a5ea316183c489bf7f5b6cf91ace5b"
+  integrity sha512-t2E9wLlssQjGw0nluF6aYyfX8LwYU8Jj0xct+pAhfWfv/YrBn6TSNtEYsgxHIfaMqfrLx07czcMg9bMN6di+3w==
   dependencies:
     accepts "~1.3.4"
     base64id "2.0.0"
-    cookie "0.3.1"
-    debug "~4.1.0"
-    engine.io-parser "~2.2.0"
-    ws "^7.1.2"
+    cookie "~0.4.1"
+    cors "~2.8.5"
+    debug "~4.3.1"
+    engine.io-parser "~4.0.0"
+    ws "~7.4.2"
 
 enhanced-resolve@^4.0.0:
   version "4.3.0"
@@ -4219,15 +4437,20 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
   integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
 
+env-paths@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
+  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
+
 envinfo@^7.7.3:
   version "7.7.3"
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.3.tgz#4b2d8622e3e7366afb8091b23ed95569ea0208cc"
   integrity sha512-46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA==
 
-errlop@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/errlop/-/errlop-2.2.0.tgz#1ff383f8f917ae328bebb802d6ca69666a42d21b"
-  integrity sha512-e64Qj9+4aZzjzzFpZC7p5kmm/ccCrbLhAJplhsDXQFs87XTsXwOpH4s1Io2s90Tau/8r2j9f4l/thhDevRjzxw==
+err-code@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
+  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
 
 errno@^0.1.3:
   version "0.1.7"
@@ -4243,12 +4466,10 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-error@^7.0.2:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/error/-/error-7.2.1.tgz#eab21a4689b5f684fc83da84a0e390de82d94894"
-  integrity sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==
-  dependencies:
-    string-template "~0.2.1"
+error@^10.4.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/error/-/error-10.4.0.tgz#6fcf0fd64bceb1e750f8ed9a3dd880f00e46a487"
+  integrity sha512-YxIFEJuhgcICugOUvRx5th0UM+ActZ9sjY0QJmeVwsQdvosZ7kYzc9QqS0Da3R5iUmgU5meGIxh0xBeZpMVeLw==
 
 es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
   version "1.17.6"
@@ -4341,12 +4562,12 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@4.0.0:
+escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -4562,7 +4783,7 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
-eventemitter3@^4.0.0:
+eventemitter3@^4.0.0, eventemitter3@^4.0.4:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
@@ -4600,7 +4821,7 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^4.0.0:
+execa@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
   integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
@@ -4762,18 +4983,6 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
-fast-glob@^2.0.2, fast-glob@^2.2.6:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
-  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
-  dependencies:
-    "@mrmlnc/readdir-enhanced" "^2.2.1"
-    "@nodelib/fs.stat" "^1.1.2"
-    glob-parent "^3.1.0"
-    is-glob "^4.0.0"
-    merge2 "^1.2.3"
-    micromatch "^3.1.10"
-
 fast-glob@^3.1.1, fast-glob@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
@@ -4937,6 +5146,14 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+find-yarn-workspace-root2@1.2.16:
+  version "1.2.16"
+  resolved "https://registry.yarnpkg.com/find-yarn-workspace-root2/-/find-yarn-workspace-root2-1.2.16.tgz#60287009dd2f324f59646bdb4b7610a6b301c2a9"
+  integrity sha512-hr6hb1w8ePMpPVUK39S4RlwJzi+xPLuVuG8XlwXU3KD5Yn3qgBWVfy3AzNlDhWvE1EORCE65/Qm26rFQt3VLVA==
+  dependencies:
+    micromatch "^4.0.2"
+    pkg-dir "^4.2.0"
+
 first-chunk-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
@@ -4972,13 +5189,6 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"
   integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==
 
-follow-redirects@1.5.10:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
-  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
-  dependencies:
-    debug "=3.1.0"
-
 follow-redirects@^1.0.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
@@ -5114,7 +5324,7 @@ fs-extra@~7.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-minipass@^2.0.0:
+fs-minipass@^2.0.0, fs-minipass@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
   integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
@@ -5214,7 +5424,7 @@ geojson-vt@^3.2.1:
   resolved "https://registry.yarnpkg.com/geojson-vt/-/geojson-vt-3.2.1.tgz#f8adb614d2c1d3f6ee7c4265cad4bbf3ad60c8b7"
   integrity sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -5260,11 +5470,6 @@ get-pixels@~3.3.0:
     request "^2.44.0"
     through "^2.3.4"
 
-get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
-
 get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -5296,14 +5501,6 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-gh-got@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-5.0.0.tgz#ee95be37106fd8748a96f8d1db4baea89e1bfa8a"
-  integrity sha1-7pW+NxBv2HSKlvjR20uuqJ4b+oo=
-  dependencies:
-    got "^6.2.0"
-    is-plain-obj "^1.1.0"
-
 gif-encoder@~0.4.1:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/gif-encoder/-/gif-encoder-0.4.3.tgz#8a2b4fe8ca895a48e3a0b6cbb340a0a6a3571899"
@@ -5326,12 +5523,12 @@ github-from-package@0.0.0:
   resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
   integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
 
-github-username@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/github-username/-/github-username-3.0.0.tgz#0a772219b3130743429f2456d0bdd3db55dce7b1"
-  integrity sha1-CnciGbMTB0NCnyRW0L3T21Xc57E=
+github-username@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/github-username/-/github-username-6.0.0.tgz#d543eced7295102996cd8e4e19050ebdcbe60658"
+  integrity sha512-7TTrRjxblSI5l6adk9zd+cV5d6i1OrJSo3Vr9xdGqFLBQo0mz5P9eIfKCDJ7eekVGGFLbce0qbPSnktXV2BjDQ==
   dependencies:
-    gh-got "^5.0.0"
+    "@octokit/rest" "^18.0.6"
 
 glob-parent@^3.1.0:
   version "3.1.0"
@@ -5348,17 +5545,12 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
-glob-to-regexp@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
-  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
-
 glob-to-regexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@7.1.6, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.6:
+glob@7.1.6, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -5409,6 +5601,18 @@ globby@^11.0.1:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
+globby@^11.0.3:
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
+  integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
+
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -5420,33 +5624,6 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-globby@^8.0.1:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
-  integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==
-  dependencies:
-    array-union "^1.0.1"
-    dir-glob "2.0.0"
-    fast-glob "^2.0.2"
-    glob "^7.1.2"
-    ignore "^3.3.5"
-    pify "^3.0.0"
-    slash "^1.0.0"
-
-globby@^9.2.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
-  integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    array-union "^1.0.2"
-    dir-glob "^2.2.2"
-    fast-glob "^2.2.6"
-    glob "^7.1.3"
-    ignore "^4.0.3"
-    pify "^4.0.1"
-    slash "^2.0.0"
-
 got@5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/got/-/got-5.6.0.tgz#bb1d7ee163b78082bbc8eb836f3f395004ea6fbf"
@@ -5469,34 +5646,20 @@ got@5.6.0:
     unzip-response "^1.0.0"
     url-parse-lax "^1.0.0"
 
-got@^6.2.0:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
-  integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=
-  dependencies:
-    create-error-class "^3.0.0"
-    duplexer3 "^0.1.4"
-    get-stream "^3.0.0"
-    is-redirect "^1.0.0"
-    is-retry-allowed "^1.0.0"
-    is-stream "^1.0.0"
-    lowercase-keys "^1.0.0"
-    safe-buffer "^5.0.1"
-    timed-out "^4.0.0"
-    unzip-response "^2.0.1"
-    url-parse-lax "^1.0.0"
-
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-grouped-queue@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/grouped-queue/-/grouped-queue-1.1.0.tgz#63e3f9ca90af952269d1d40879e41221eacc74cb"
-  integrity sha512-rZOFKfCqLhsu5VqjBjEWiwrYqJR07KxIkH4mLZlNlGDfntbb4FbMyGFP14TlvRPrU9S3Hnn/sgxbC5ZeN0no3Q==
-  dependencies:
-    lodash "^4.17.15"
+graceful-fs@^4.1.5, graceful-fs@^4.2.3:
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
+
+grouped-queue@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/grouped-queue/-/grouped-queue-2.0.0.tgz#a2c6713f2171e45db2c300a3a9d7c119d694dac8"
+  integrity sha512-/PiFUa7WIsl48dUeCvhIHnwNmAAzlI/eHoJl0vu3nsFA366JleY7Ff8EVTplZu5kO0MIdZjKTTnzItL61ahbnw==
 
 growl@1.10.5:
   version "1.10.5"
@@ -5538,18 +5701,6 @@ has-bigints@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
   integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
 
-has-binary2@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
-  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
-  dependencies:
-    isarray "2.0.1"
-
-has-cors@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -5663,9 +5814,16 @@ hmac-drbg@^1.0.1:
     minimalistic-crypto-utils "^1.0.1"
 
 hosted-git-info@^2.1.4:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
+
+hosted-git-info@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961"
+  integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==
+  dependencies:
+    lru-cache "^6.0.0"
 
 hpack.js@^2.1.6:
   version "2.1.6"
@@ -5731,6 +5889,11 @@ htmlparser2@^3.3.0:
     inherits "^2.0.1"
     readable-stream "^3.1.1"
 
+http-cache-semantics@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
+  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
@@ -5773,9 +5936,18 @@ http-parser-js@>=0.5.1:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.2.tgz#da2e31d237b393aae72ace43882dd7e270a8ff77"
   integrity sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==
 
-http-proxy-middleware@0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
+http-proxy-agent@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
+  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
+  dependencies:
+    "@tootallnate/once" "1"
+    agent-base "6"
+    debug "4"
+
+http-proxy-middleware@0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
   integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
   dependencies:
     http-proxy "^1.17.0"
@@ -5806,7 +5978,7 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-https-proxy-agent@5.0.0:
+https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
   integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
@@ -5832,6 +6004,13 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
+  dependencies:
+    ms "^2.0.0"
+
 iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -5839,6 +6018,13 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@^0.6.2:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 icss-utils@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
@@ -5854,12 +6040,14 @@ ieee754@^1.1.4:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
   integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
-ignore@^3.3.5:
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
-  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
+ignore-walk@^3.0.3:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
+  integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
+  dependencies:
+    minimatch "^3.0.4"
 
-ignore@^4.0.3, ignore@^4.0.6:
+ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
@@ -5920,10 +6108,10 @@ indexes-of@^1.0.1:
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
   integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
 
-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
+infer-owner@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
 
 inflight@^1.0.4:
   version "1.0.6"
@@ -5974,6 +6162,25 @@ inquirer@^7.1.0:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
+inquirer@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.0.0.tgz#957a46db1abcf0fdd2ab82deb7470e90afc7d0ac"
+  integrity sha512-ON8pEJPPCdyjxj+cxsYRe6XfCJepTxANdNnTebsTuQgXpRyZRRT9t4dJwjRubgmvn20CLSEnozRUayXyM9VTXA==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-width "^3.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.21"
+    mute-stream "0.0.8"
+    run-async "^2.4.0"
+    rxjs "^6.6.6"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
+
 internal-ip@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
@@ -6082,11 +6289,6 @@ is-buffer@^1.0.2, is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-buffer@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
-  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
-
 is-callable@^1.1.4, is-callable@^1.2.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
@@ -6204,6 +6406,11 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-lambda@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
+  integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=
+
 is-nan@^1.2.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
@@ -6258,7 +6465,7 @@ is-path-inside@^2.1.0:
   dependencies:
     path-is-inside "^1.0.2"
 
-is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
+is-plain-obj@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
@@ -6275,6 +6482,11 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
 is-redirect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
@@ -6300,12 +6512,12 @@ is-retry-allowed@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
   integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
 
-is-scoped@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-scoped/-/is-scoped-1.0.0.tgz#449ca98299e713038256289ecb2b540dc437cb30"
-  integrity sha1-RJypgpnnEwOCViieyytUDcQ3yzA=
+is-scoped@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-scoped/-/is-scoped-2.1.0.tgz#fef0713772658bdf5bee418608267ddae6d3566d"
+  integrity sha512-Cv4OpPTHAK9kHYzkzCrof3VJh7H/PrG2MBUMvvJebaaUMbqhm0YAtXnvh0I3Hnj2tMZWwrRROWLSgfJrKqWmlQ==
   dependencies:
-    scoped-regex "^1.0.0"
+    scoped-regex "^2.0.0"
 
 is-stream@^1.0.0, is-stream@^1.1.0:
   version "1.1.0"
@@ -6377,16 +6589,16 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
-isarray@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
-  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
-
-isbinaryfile@^4.0.0, isbinaryfile@^4.0.6:
+isbinaryfile@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b"
   integrity sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==
 
+isbinaryfile@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf"
+  integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -6486,15 +6698,6 @@ istanbul-reports@^3.0.0, istanbul-reports@^3.0.2:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-istextorbinary@^2.5.1:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.6.0.tgz#60776315fb0fa3999add276c02c69557b9ca28ab"
-  integrity sha512-+XRlFseT8B3L9KyjxxLjfXSLMuErKDsd8DBNrsaxoViABMEZlOSCstwmw0qpoFX3+U6yWU1yhLudAe6/lETGGA==
-  dependencies:
-    binaryextensions "^2.1.2"
-    editions "^2.2.0"
-    textextensions "^2.5.0"
-
 jake@^10.6.1:
   version "10.8.2"
   resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"
@@ -6569,6 +6772,14 @@ js-yaml@3.14.0, js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^3.13.0:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 js-yaml@~3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
@@ -6592,6 +6803,11 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -6619,6 +6835,11 @@ json-stable-stringify@^1.0.1:
   dependencies:
     jsonify "~0.0.0"
 
+json-stringify-nice@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67"
+  integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==
+
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -6676,7 +6897,7 @@ jsonify@~0.0.0:
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
   integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
-jsonparse@^1.2.0:
+jsonparse@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
@@ -6701,6 +6922,16 @@ jszip@^3.2.2:
     readable-stream "~2.3.6"
     set-immediate-shim "~1.0.1"
 
+just-diff-apply@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-3.0.0.tgz#a77348d24f0694e378b57293dceb65bdf5a91c4f"
+  integrity sha512-K2MLc+ZC2DVxX4V61bIKPeMUUfj1YYZ3h0myhchDXOW1cKoPZMnjIoNCqv9bF2n5Oob1PFxuR2gVJxkxz4e58w==
+
+just-diff@^3.0.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-3.1.1.tgz#d50c597c6fd4776495308c63bdee1b6839082647"
+  integrity sha512-sdMWKjRq8qWZEjDcVA6llnUT8RDEBIfOiGpYFPYa9u+2c39JCsejktSP7mj5eRid5EIvTzIpQ2kDOCw1Nq9BjQ==
+
 just-extend@^4.0.2:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.0.tgz#7278a4027d889601640ee0ce0e5a00b992467da4"
@@ -6788,10 +7019,10 @@ karma-typescript@^5.5.1:
     util "^0.12.1"
     vm-browserify "^1.1.2"
 
-karma@^5.2.3:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-5.2.3.tgz#3264024219bad2728e92542e0058a2492d7a46e4"
-  integrity sha512-tHdyFADhVVPBorIKCX8A37iLHxc6RBRphkSoQ+MLKdAtFn1k97tD8WUGi1KlEtDZKL3hui0qhsY9HXUfSNDYPQ==
+karma@^6.3.2:
+  version "6.3.2"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-6.3.2.tgz#24b62fbae3e8b5218cc32a0dac49ad08a541e76d"
+  integrity sha512-fo4Wt0S99/8vylZMxNj4cBFyOBBnC1bewZ0QOlePij/2SZVWxqbyLeIddY13q6URa2EpLRW8ixvFRUMjkmo1bw==
   dependencies:
     body-parser "^1.19.0"
     braces "^3.0.2"
@@ -6811,11 +7042,11 @@ karma@^5.2.3:
     qjobs "^1.2.0"
     range-parser "^1.2.1"
     rimraf "^3.0.2"
-    socket.io "^2.3.0"
+    socket.io "^3.1.0"
     source-map "^0.6.1"
     tmp "0.2.1"
-    ua-parser-js "0.7.22"
-    yargs "^15.3.1"
+    ua-parser-js "^0.7.23"
+    yargs "^16.1.1"
 
 killable@^1.0.1:
   version "1.0.1"
@@ -6853,13 +7084,6 @@ layout@~2.2.0:
   dependencies:
     bin-pack "~1.0.1"
 
-lazy-cache@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264"
-  integrity sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=
-  dependencies:
-    set-getter "^0.1.0"
-
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -6909,6 +7133,16 @@ load-json-file@^2.0.0:
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
+load-yaml-file@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/load-yaml-file/-/load-yaml-file-0.2.0.tgz#af854edaf2bea89346c07549122753c07372f64d"
+  integrity sha512-OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==
+  dependencies:
+    graceful-fs "^4.1.5"
+    js-yaml "^3.13.0"
+    pify "^4.0.1"
+    strip-bom "^3.0.0"
+
 loader-runner@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
@@ -6982,7 +7216,7 @@ lodash.memoize@~3.0.3:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
   integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@~4.17.15:
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@~4.17.15:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -6994,13 +7228,6 @@ log-symbols@4.0.0, log-symbols@^4.0.0:
   dependencies:
     chalk "^4.0.0"
 
-log-symbols@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
-  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
-  dependencies:
-    chalk "^2.0.1"
-
 log4js@^6.2.1, log4js@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.3.0.tgz#10dfafbb434351a3e30277a00b9879446f715bcb"
@@ -7034,6 +7261,13 @@ lowercase-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
   integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 lunr@^2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.8.tgz#a8b89c31f30b5a044b97d2d28e2da191b6ba2072"
@@ -7059,6 +7293,27 @@ make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
+make-fetch-happen@^8.0.9:
+  version "8.0.14"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz#aaba73ae0ab5586ad8eaa68bd83332669393e222"
+  integrity sha512-EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ==
+  dependencies:
+    agentkeepalive "^4.1.3"
+    cacache "^15.0.5"
+    http-cache-semantics "^4.1.0"
+    http-proxy-agent "^4.0.1"
+    https-proxy-agent "^5.0.0"
+    is-lambda "^1.0.1"
+    lru-cache "^6.0.0"
+    minipass "^3.1.3"
+    minipass-collect "^1.0.2"
+    minipass-fetch "^1.3.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    promise-retry "^2.0.1"
+    socks-proxy-agent "^5.0.0"
+    ssri "^8.0.0"
+
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -7090,46 +7345,26 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-mem-fs-editor@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/mem-fs-editor/-/mem-fs-editor-6.0.0.tgz#d63607cf0a52fe6963fc376c6a7aa52db3edabab"
-  integrity sha512-e0WfJAMm8Gv1mP5fEq/Blzy6Lt1VbLg7gNnZmZak7nhrBTibs+c6nQ4SKs/ZyJYHS1mFgDJeopsLAv7Ow0FMFg==
-  dependencies:
-    commondir "^1.0.1"
-    deep-extend "^0.6.0"
-    ejs "^2.6.1"
-    glob "^7.1.4"
-    globby "^9.2.0"
-    isbinaryfile "^4.0.0"
-    mkdirp "^0.5.0"
-    multimatch "^4.0.0"
-    rimraf "^2.6.3"
-    through2 "^3.0.1"
-    vinyl "^2.2.0"
-
-mem-fs-editor@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/mem-fs-editor/-/mem-fs-editor-7.0.1.tgz#e0797802b7797acf43ef3c511f3d3ad5ea765783"
-  integrity sha512-eD8r4/d2ayp9HHIgBPHB6Ds0ggA8F9cf9HxcNtbqrwqJXfIDrOSMG5K4fV3+Ib3B+HIdrWqkeDDDvrO7i9EbvQ==
+"mem-fs-editor@^8.1.2 || ^9.0.0", mem-fs-editor@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/mem-fs-editor/-/mem-fs-editor-9.0.1.tgz#c700117476ff004cdacf5fa66f4fd1b5410b23c9"
+  integrity sha512-SqW+DkPbxZVzVldNHexoo5MiUR3YpIqiCVcZ/SZ6f7KToaSV7pMd4/URrkD5mnj35bd6NAK7SlftHSyW+Kgk4w==
   dependencies:
+    binaryextensions "^4.15.0"
     commondir "^1.0.1"
     deep-extend "^0.6.0"
-    ejs "^3.0.1"
-    glob "^7.1.4"
-    globby "^9.2.0"
-    isbinaryfile "^4.0.0"
-    mkdirp "^1.0.0"
-    multimatch "^4.0.0"
-    rimraf "^3.0.0"
-    through2 "^3.0.1"
-    vinyl "^2.2.0"
+    ejs "^3.1.6"
+    globby "^11.0.3"
+    isbinaryfile "^4.0.8"
+    multimatch "^5.0.0"
+    normalize-path "^3.0.0"
+    textextensions "^5.12.0"
 
-mem-fs@^1.1.0, mem-fs@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mem-fs/-/mem-fs-1.2.0.tgz#5f29b2d02a5875cd14cd836c388385892d556cde"
-  integrity sha512-b8g0jWKdl8pM0LqAPdK9i8ERL7nYrzmJfRhxMiWH2uYdfYnb7uXnmwVb0ZGe7xyEl4lj+nLIU3yf4zPUT+XsVQ==
+"mem-fs@^1.2.0 || ^2.0.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/mem-fs/-/mem-fs-2.2.0.tgz#c46948d1026b83047b13d6c59441c0af0e5e913b"
+  integrity sha512-++YfPTeWZfC6CmPqKIRU7w9D8XccvPy2eoxHGrFJClQ+bE7EiZfRNtFS6Zi9Xq0rsVwETpRK2Ee0c0CnLchtyQ==
   dependencies:
-    through2 "^3.0.0"
     vinyl "^2.0.1"
     vinyl-file "^3.0.0"
 
@@ -7166,7 +7401,7 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.2.3, merge2@^1.3.0:
+merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -7291,13 +7526,68 @@ minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minipass@^3.0.0:
+minipass-collect@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.3.3.tgz#34c7cea038c817a8658461bf35174551dce17a0a"
+  integrity sha512-akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ==
+  dependencies:
+    minipass "^3.1.0"
+    minipass-sized "^1.0.3"
+    minizlib "^2.0.0"
+  optionalDependencies:
+    encoding "^0.1.12"
+
+minipass-flush@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-json-stream@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7"
+  integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==
+  dependencies:
+    jsonparse "^1.3.1"
+    minipass "^3.0.0"
+
+minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-sized@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
+  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
   integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
   dependencies:
     yallist "^4.0.0"
 
+minizlib@^2.0.0, minizlib@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+  dependencies:
+    minipass "^3.0.0"
+    yallist "^4.0.0"
+
 minizlib@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.0.tgz#fd52c645301ef09a63a2c209697c294c6ce02cf3"
@@ -7319,6 +7609,15 @@ mkdirp-classic@^0.5.2:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
+mkdirp-infer-owner@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
+  integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==
+  dependencies:
+    chownr "^2.0.0"
+    infer-owner "^1.0.4"
+    mkdirp "^1.0.3"
+
 mkdirp@0.3.x, mkdirp@~0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7"
@@ -7331,14 +7630,14 @@ mkdirp@0.5.1:
   dependencies:
     minimist "0.0.8"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@^0.5.5:
+mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
   dependencies:
     minimist "^1.2.5"
 
-mkdirp@^1.0.0, mkdirp@^1.0.3, mkdirp@^1.0.4:
+mkdirp@^1.0.3, mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -7390,11 +7689,6 @@ mocha@^8.2.1:
     yargs-parser "13.1.2"
     yargs-unparser "2.0.0"
 
-moment@^2.15.1, moment@^2.24.0:
-  version "2.27.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
-  integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -7410,6 +7704,11 @@ ms@2.1.2, ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.0.0:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 multicast-dns-service-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
@@ -7423,10 +7722,10 @@ multicast-dns@^6.0.1:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
 
-multimatch@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-4.0.0.tgz#8c3c0f6e3e8449ada0af3dd29efb491a375191b3"
-  integrity sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==
+multimatch@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-5.0.0.tgz#932b800963cea7a31a033328fa1e0c3a1874dbe6"
+  integrity sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==
   dependencies:
     "@types/minimatch" "^3.0.3"
     array-differ "^3.0.0"
@@ -7449,10 +7748,10 @@ nanoid@3.1.12:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.12.tgz#6f7736c62e8d39421601e4a0c77623a97ea69654"
   integrity sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==
 
-nanoid@^3.1.20:
-  version "3.1.20"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"
-  integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==
+nanoid@^3.1.23:
+  version "3.1.23"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
+  integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -7540,6 +7839,17 @@ nise@^4.0.4:
     just-extend "^4.0.2"
     path-to-regexp "^1.7.0"
 
+nise@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/nise/-/nise-4.1.0.tgz#8fb75a26e90b99202fa1e63f448f58efbcdedaf6"
+  integrity sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+    "@sinonjs/fake-timers" "^6.0.0"
+    "@sinonjs/text-encoding" "^0.7.1"
+    just-extend "^4.0.2"
+    path-to-regexp "^1.7.0"
+
 no-case@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz#c21b434c1ffe48b39087e86cfb4d2582e9df18f8"
@@ -7575,6 +7885,22 @@ node-forge@^0.10.0:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
   integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
 
+node-gyp@^7.1.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
+  integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
+  dependencies:
+    env-paths "^2.2.0"
+    glob "^7.1.4"
+    graceful-fs "^4.2.3"
+    nopt "^5.0.0"
+    npmlog "^4.1.2"
+    request "^2.88.2"
+    rimraf "^3.0.2"
+    semver "^7.3.2"
+    tar "^6.0.2"
+    which "^2.0.2"
+
 node-preload@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/node-preload/-/node-preload-0.2.1.tgz#c03043bb327f417a18fee7ab7ee57b408a144301"
@@ -7582,10 +7908,10 @@ node-preload@^0.2.1:
   dependencies:
     process-on-spawn "^1.0.0"
 
-node-releases@^1.1.67:
-  version "1.1.67"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
-  integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==
+node-releases@^1.1.71:
+  version "1.1.72"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
+  integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==
 
 node-status-codes@^1.0.0:
   version "1.0.0"
@@ -7605,6 +7931,13 @@ noop-logger@^0.1.1:
   resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
   integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=
 
+nopt@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
+  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
+  dependencies:
+    abbrev "1"
+
 normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -7627,17 +7960,66 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-npm-api@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/npm-api/-/npm-api-1.0.0.tgz#6033c283bb04ddb0185344c1ad07ed4f67c77989"
-  integrity sha512-gtJhIhGq07g9H5sIAB9TZzTySW8MYtcYqg+e+J+5q1GmDsDLLVfyvVBL1VklzjtRsElph11GUtLBS191RDOJxQ==
+npm-bundled@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
+  integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
   dependencies:
-    JSONStream "^1.3.5"
-    clone-deep "^4.0.1"
-    download-stats "^0.3.4"
-    moment "^2.24.0"
-    paged-request "^2.0.1"
-    request "^2.88.0"
+    npm-normalize-package-bin "^1.0.1"
+
+npm-install-checks@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
+  integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
+  dependencies:
+    semver "^7.1.1"
+
+npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+
+npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.2:
+  version "8.1.2"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.2.tgz#b868016ae7de5619e729993fbd8d11dc3c52ab62"
+  integrity sha512-6Eem455JsSMJY6Kpd3EyWE+n5hC+g9bSyHr9K9U2zqZb7+02+hObQ2c0+8iDk/mNF+8r1MhY44WypKJAkySIYA==
+  dependencies:
+    hosted-git-info "^4.0.1"
+    semver "^7.3.4"
+    validate-npm-package-name "^3.0.0"
+
+npm-packlist@^2.1.4:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8"
+  integrity sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==
+  dependencies:
+    glob "^7.1.6"
+    ignore-walk "^3.0.3"
+    npm-bundled "^1.1.1"
+    npm-normalize-package-bin "^1.0.1"
+
+npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.0, npm-pick-manifest@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
+  integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==
+  dependencies:
+    npm-install-checks "^4.0.0"
+    npm-normalize-package-bin "^1.0.1"
+    npm-package-arg "^8.1.2"
+    semver "^7.3.4"
+
+npm-registry-fetch@^10.0.0:
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-10.1.2.tgz#11ffe03d813c653e768bdf762cfc5f1afe91b8bd"
+  integrity sha512-KsM/TdPmntqgBFlfsbkOLkkE9ovZo7VpVcd+/eTdYszCrgy5zFl5JzWm+OxavFaEWlbkirpkou+ZYI00RmOBFA==
+  dependencies:
+    lru-cache "^6.0.0"
+    make-fetch-happen "^8.0.9"
+    minipass "^3.1.3"
+    minipass-fetch "^1.3.0"
+    minipass-json-stream "^1.0.1"
+    minizlib "^2.0.0"
+    npm-package-arg "^8.0.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -7718,16 +8100,11 @@ obj-extend@~0.1.0:
   resolved "https://registry.yarnpkg.com/obj-extend/-/obj-extend-0.1.0.tgz#bb448a4775fb95eb34a781f908bbac2df23dbb5b"
   integrity sha1-u0SKR3X7les0p4H5CLusLfI9u1s=
 
-object-assign@*, object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@*, object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
-object-component@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
-  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
-
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
@@ -7942,6 +8319,21 @@ p-map@^3.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+  dependencies:
+    aggregate-error "^3.0.0"
+
+p-queue@^6.6.2:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426"
+  integrity sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==
+  dependencies:
+    eventemitter3 "^4.0.4"
+    p-timeout "^3.2.0"
+
 p-retry@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328"
@@ -7949,12 +8341,19 @@ p-retry@^3.0.1:
   dependencies:
     retry "^0.12.0"
 
+p-timeout@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
+  dependencies:
+    p-finally "^1.0.0"
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
   integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
-p-try@^2.0.0, p-try@^2.1.0:
+p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
@@ -7969,6 +8368,31 @@ package-hash@^4.0.0:
     lodash.flattendeep "^4.4.0"
     release-zalgo "^1.0.0"
 
+pacote@^11.1.11, pacote@^11.2.6:
+  version "11.3.3"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.3.tgz#d7d6091464f77c09691699df2ded13ab906b3e68"
+  integrity sha512-GQxBX+UcVZrrJRYMK2HoG+gPeSUX/rQhnbPkkGrCYa4n2F/bgClFPaMm0nsdnYrxnmUy85uMHoFXZ0jTD0drew==
+  dependencies:
+    "@npmcli/git" "^2.0.1"
+    "@npmcli/installed-package-contents" "^1.0.6"
+    "@npmcli/promise-spawn" "^1.2.0"
+    "@npmcli/run-script" "^1.8.2"
+    cacache "^15.0.5"
+    chownr "^2.0.0"
+    fs-minipass "^2.1.0"
+    infer-owner "^1.0.4"
+    minipass "^3.1.3"
+    mkdirp "^1.0.3"
+    npm-package-arg "^8.0.1"
+    npm-packlist "^2.1.4"
+    npm-pick-manifest "^6.0.0"
+    npm-registry-fetch "^10.0.0"
+    promise-retry "^2.0.1"
+    read-package-json-fast "^2.0.1"
+    rimraf "^3.0.2"
+    ssri "^8.0.1"
+    tar "^6.1.0"
+
 pad@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/pad/-/pad-3.2.0.tgz#be7a1d1cb6757049b4ad5b70e71977158fea95d1"
@@ -7976,13 +8400,6 @@ pad@^3.2.0:
   dependencies:
     wcwidth "^1.0.1"
 
-paged-request@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/paged-request/-/paged-request-2.0.1.tgz#91164f042231feb68643542d2530476a518ff4de"
-  integrity sha512-C0bB/PFk9rQskD1YEiz7uuchzqKDQGgdsEHN1ahify0UUWzgmMK4NDG9fhlQg2waogmNFwEvEeHfMRvJySpdVw==
-  dependencies:
-    axios "^0.18.0"
-
 pako@~1.0.2, pako@~1.0.5:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
@@ -8032,6 +8449,15 @@ parse-bmfont-xml@^1.1.4:
     xml-parse-from-string "^1.0.0"
     xml2js "^0.4.5"
 
+parse-conflict-json@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-1.1.1.tgz#54ec175bde0f2d70abf6be79e0e042290b86701b"
+  integrity sha512-4gySviBiW5TRl7XHvp1agcS7SOe0KZOjC//71dzZVWJrY9hCrgtvl5v3SyIxCZ4fZF47TxD9nfzmxcx76xmbUw==
+  dependencies:
+    json-parse-even-better-errors "^2.3.0"
+    just-diff "^3.0.1"
+    just-diff-apply "^3.0.0"
+
 parse-data-uri@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/parse-data-uri/-/parse-data-uri-0.2.0.tgz#bf04d851dd5c87b0ab238e5d01ace494b604b4c9"
@@ -8061,30 +8487,6 @@ parse-json@^5.0.0:
     json-parse-better-errors "^1.0.1"
     lines-and-columns "^1.1.6"
 
-parseqs@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
-  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
-  dependencies:
-    better-assert "~1.0.0"
-
-parseqs@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
-  integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
-
-parseuri@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
-  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
-  dependencies:
-    better-assert "~1.0.0"
-
-parseuri@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
-  integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
-
 parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -8167,13 +8569,6 @@ path-type@^2.0.0:
   dependencies:
     pify "^2.0.0"
 
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
-
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -8228,11 +8623,6 @@ pify@^2.0.0, pify@^2.3.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-
 pify@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
@@ -8384,12 +8774,12 @@ postcss-value-parser@^4.1.0:
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
 postcss@^8.1.4:
-  version "8.2.4"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.4.tgz#20a98a39cf303d15129c2865a9ec37eda0031d04"
-  integrity sha512-kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg==
+  version "8.2.15"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65"
+  integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==
   dependencies:
-    colorette "^1.2.1"
-    nanoid "^3.1.20"
+    colorette "^1.2.2"
+    nanoid "^3.1.23"
     source-map "^0.6.1"
 
 prebuild-install@^5.3.5:
@@ -8413,6 +8803,16 @@ prebuild-install@^5.3.5:
     tunnel-agent "^0.6.0"
     which-pm-runs "^1.0.0"
 
+preferred-pm@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/preferred-pm/-/preferred-pm-3.0.3.tgz#1b6338000371e3edbce52ef2e4f65eb2e73586d6"
+  integrity sha512-+wZgbxNES/KlJs9q40F/1sfOd/j7f1O9JaHcW5Dsn3aUUOZg3L2bjpVUcKV2jvtElYfoTuQiNeMfQJ4kwUAhCQ==
+  dependencies:
+    find-up "^5.0.0"
+    find-yarn-workspace-root2 "1.2.16"
+    path-exists "^4.0.0"
+    which-pm "2.0.0"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -8435,10 +8835,10 @@ prettier@^2.2.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
   integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
 
-pretty-bytes@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz#f2849e27db79fb4d6cfe24764fc4134f165989f2"
-  integrity sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==
+pretty-bytes@^5.3.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
+  integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
 
 pretty-error@^2.1.1:
   version "2.1.1"
@@ -8480,11 +8880,34 @@ progress@^2.0.0, progress@^2.0.1, progress@^2.0.3:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
+promise-all-reject-late@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz#f8ebf13483e5ca91ad809ccc2fcf25f26f8643c2"
+  integrity sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==
+
+promise-call-limit@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-call-limit/-/promise-call-limit-1.0.1.tgz#4bdee03aeb85674385ca934da7114e9bcd3c6e24"
+  integrity sha512-3+hgaa19jzCGLuSCbieeRsu5C2joKfYn8pY6JAuXFRVfF4IO+L7UPpFWNTeWT9pM7uhskvbPPd/oEOktCn317Q==
+
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
+
 promise-limit@^2.6.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/promise-limit/-/promise-limit-2.7.0.tgz#eb5737c33342a030eaeaecea9b3d3a93cb592b26"
   integrity sha512-7nJ6v5lnJsXwGprnGXga4wx6d1POjvi5Qmf1ivTRxTjH4Z/9Czja/UCMLVmB9N93GeWOU93XaFaEt6jbuoagNw==
 
+promise-retry@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
+  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
+  dependencies:
+    err-code "^2.0.2"
+    retry "^0.12.0"
+
 protobufjs@^6.9.0:
   version "6.10.1"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.10.1.tgz#e6a484dd8f04b29629e9053344e3970cccf13cd2"
@@ -8680,13 +9103,18 @@ read-chunk@^1.0.1:
   resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-1.0.1.tgz#5f68cab307e663f19993527d9b589cace4661194"
   integrity sha1-X2jKswfmY/GZk1J9m1icrORmEZQ=
 
-read-chunk@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-3.2.0.tgz#2984afe78ca9bfbbdb74b19387bf9e86289c16ca"
-  integrity sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==
+read-cmd-shim@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
+  integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==
+
+read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.2.tgz#2dcb24d9e8dd50fb322042c8c35a954e6cc7ac9e"
+  integrity sha512-5fyFUyO9B799foVk4n6ylcoAktG/FbE3jwRKxvwaeSrIunaoMc0u81dzXxjeAFKOce7O5KncdfwpGvvs6r5PsQ==
   dependencies:
-    pify "^4.0.1"
-    with-open-file "^0.1.6"
+    json-parse-even-better-errors "^2.3.0"
+    npm-normalize-package-bin "^1.0.1"
 
 read-pkg-up@^2.0.0:
   version "2.0.0"
@@ -8696,13 +9124,14 @@ read-pkg-up@^2.0.0:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
-read-pkg-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-5.0.0.tgz#b6a6741cb144ed3610554f40162aa07a6db621b8"
-  integrity sha512-XBQjqOBtTzyol2CpsQOw8LHV0XbDZVG7xMMjmXAJomlVY03WOBRmYgDJETlvcg0H63AJvPRwT7GFi5rvOzUOKg==
+read-pkg-up@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
   dependencies:
-    find-up "^3.0.0"
-    read-pkg "^5.0.0"
+    find-up "^4.1.0"
+    read-pkg "^5.2.0"
+    type-fest "^0.8.1"
 
 read-pkg@^2.0.0:
   version "2.0.0"
@@ -8713,7 +9142,7 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-read-pkg@^5.0.0:
+read-pkg@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
   integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
@@ -8723,15 +9152,6 @@ read-pkg@^5.0.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-"readable-stream@2 || 3", readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.5, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
@@ -8745,6 +9165,15 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readable-stream@~1.0.31, readable-stream@~1.0.33-1:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
@@ -8777,6 +9206,16 @@ readable-stream@~2.0.0:
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
+readdir-scoped-modules@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
+  integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
+
 readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -8876,7 +9315,7 @@ replace-ext@^1.0.0:
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
   integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
 
-request@^2.12.0, request@^2.44.0, request@^2.65.0, request@^2.88.0:
+request@^2.12.0, request@^2.44.0, request@^2.65.0, request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -9048,6 +9487,13 @@ rxjs@^6.6.0:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.6.6:
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -9065,7 +9511,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -9115,10 +9561,10 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-scoped-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/scoped-regex/-/scoped-regex-1.0.0.tgz#a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"
-  integrity sha1-o0a7Gs1CB65wvXwMfKnlZra63bg=
+scoped-regex@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/scoped-regex/-/scoped-regex-2.1.0.tgz#7b9be845d81fd9d21d1ec97c61a0b7cf86d2015f"
+  integrity sha512-g3WxHrqSWCZHGHlSrF51VXFdjImhwvH8ZO/pryFH56Qi0cDsZfylQa/t0jCzVQFNbNvM00HfHjkDPEuarKDSWQ==
 
 script-ext-html-webpack-plugin@^2.1.4:
   version "2.1.4"
@@ -9158,7 +9604,14 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@~7.3.0:
+semver@^7.1.1, semver@^7.1.3, semver@^7.3.4, semver@^7.3.5:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
+semver@^7.2.1, semver@^7.3.2, semver@~7.3.0:
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
   integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
@@ -9222,13 +9675,6 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-getter@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.0.tgz#d769c182c9d5a51f409145f2fba82e5e86e80376"
-  integrity sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=
-  dependencies:
-    to-object-path "^0.3.0"
-
 set-immediate-shim@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
@@ -9313,7 +9759,7 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shelljs@^0.8.3, shelljs@^0.8.4:
+shelljs@^0.8.4:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
   integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
@@ -9357,7 +9803,19 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
-sinon@^9.0.1, sinon@^9.2.2:
+sinon@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-10.0.0.tgz#52279f97e35646ff73d23207d0307977c9b81430"
+  integrity sha512-XAn5DxtGVJBlBWYrcYKEhWCz7FLwZGdyvANRyK06419hyEpdT0dMc5A8Vcxg5SCGHc40CsqoKsc1bt1CbJPfNw==
+  dependencies:
+    "@sinonjs/commons" "^1.8.1"
+    "@sinonjs/fake-timers" "^6.0.1"
+    "@sinonjs/samsam" "^5.3.1"
+    diff "^4.0.2"
+    nise "^4.1.0"
+    supports-color "^7.1.0"
+
+sinon@^9.2.2:
   version "9.2.3"
   resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.2.3.tgz#f68ce414e843e2fd638703043c97f260697caa52"
   integrity sha512-m+DyAWvqVHZtjnjX/nuShasykFeiZ+nPuEfD4G3gpvKGkXRhkF/6NSt2qN2FjZhfrcHXFzUzI+NLnk+42fnLEw==
@@ -9374,16 +9832,6 @@ skmeans@0.9.7:
   resolved "https://registry.yarnpkg.com/skmeans/-/skmeans-0.9.7.tgz#72670cebb728508f56e29c0e10d11e623529ce5d"
   integrity sha512-hNj1/oZ7ygsfmPZ7ZfN5MUBRoGg1gtpnImuJBgLO0ljQ67DtJuiQaiYdS4lUA6s0KCwnPhGivtC/WRwIZLkHyg==
 
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
-
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -9398,6 +9846,11 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
+smart-buffer@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
+  integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
+
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -9428,60 +9881,34 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socket.io-adapter@~1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
-  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
+socket.io-adapter@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz#edc5dc36602f2985918d631c1399215e97a1b527"
+  integrity sha512-+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg==
 
-socket.io-client@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz#14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4"
-  integrity sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==
-  dependencies:
-    backo2 "1.0.2"
-    base64-arraybuffer "0.1.5"
-    component-bind "1.0.0"
-    component-emitter "1.2.1"
-    debug "~4.1.0"
-    engine.io-client "~3.4.0"
-    has-binary2 "~1.0.2"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    object-component "0.0.3"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
-    socket.io-parser "~3.3.0"
-    to-array "0.1.4"
-
-socket.io-parser@~3.3.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.1.tgz#f07d9c8cb3fb92633aa93e76d98fd3a334623199"
-  integrity sha512-1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ==
+socket.io-parser@~4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0"
+  integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==
   dependencies:
+    "@types/component-emitter" "^1.2.10"
     component-emitter "~1.3.0"
-    debug "~3.1.0"
-    isarray "2.0.1"
-
-socket.io-parser@~3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a"
-  integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==
-  dependencies:
-    component-emitter "1.2.1"
-    debug "~4.1.0"
-    isarray "2.0.1"
+    debug "~4.3.1"
 
-socket.io@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.3.0.tgz#cd762ed6a4faeca59bc1f3e243c0969311eb73fb"
-  integrity sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==
+socket.io@^3.1.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-3.1.2.tgz#06e27caa1c4fc9617547acfbb5da9bc1747da39a"
+  integrity sha512-JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw==
   dependencies:
-    debug "~4.1.0"
-    engine.io "~3.4.0"
-    has-binary2 "~1.0.2"
-    socket.io-adapter "~1.1.0"
-    socket.io-client "2.3.0"
-    socket.io-parser "~3.4.0"
+    "@types/cookie" "^0.4.0"
+    "@types/cors" "^2.8.8"
+    "@types/node" ">=10.0.0"
+    accepts "~1.3.4"
+    base64id "~2.0.0"
+    debug "~4.3.1"
+    engine.io "~4.1.0"
+    socket.io-adapter "~2.1.0"
+    socket.io-parser "~4.0.3"
 
 sockjs-client@1.4.0:
   version "1.4.0"
@@ -9504,6 +9931,23 @@ sockjs@0.3.20:
     uuid "^3.4.0"
     websocket-driver "0.6.5"
 
+socks-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz#7c0f364e7b1cf4a7a437e71253bed72e9004be60"
+  integrity sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+    socks "^2.3.3"
+
+socks@^2.3.3:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e"
+  integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==
+  dependencies:
+    ip "^1.1.5"
+    smart-buffer "^4.1.0"
+
 source-list-map@^2.0.0, source-list-map@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
@@ -9647,6 +10091,13 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
+ssri@^8.0.0, ssri@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
+  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
+  dependencies:
+    minipass "^3.1.1"
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -9711,11 +10162,6 @@ streamroller@^2.2.4:
     debug "^4.1.1"
     fs-extra "^8.1.0"
 
-string-template@~0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
-  integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
-
 string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -9982,6 +10428,23 @@ tar@6.0.2:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
+tar@^6.0.2, tar@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83"
+  integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^3.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
+temp-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e"
+  integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==
+
 terser-webpack-plugin@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz#7effadee06f7ecfa093dbbd3e9ab23f5f3ed8673"
@@ -10026,15 +10489,15 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-textextensions@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.6.0.tgz#d7e4ab13fe54e32e08873be40d51b74229b00fc4"
-  integrity sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==
+textextensions@^5.12.0:
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-5.12.0.tgz#b908120b5c1bd4bb9eba41423d75b176011ab68a"
+  integrity sha512-IYogUDaP65IXboCiPPC0jTLLBzYlhhw2Y4b0a2trPgbHNGGGEfuHE6tds+yDcCf4mpNDaGISFzwSSezcXt+d6w==
 
-three@^0.127.0:
-  version "0.127.0"
-  resolved "https://registry.yarnpkg.com/three/-/three-0.127.0.tgz#c463f4d41b2c735dcf8e9e51a388815e80cd3791"
-  integrity sha512-wtgrn+mhYUbobxT7QN3GPdu3SRpSBQvwY6uOzLChWS7QE//f7paDU/+wlzbg+ngeIvBBqjBHSRuywTh8A99Jng==
+three@^0.129.0:
+  version "0.129.0"
+  resolved "https://registry.yarnpkg.com/three/-/three-0.129.0.tgz#f5e530bbc96eac5d5b4749cb5da886ef0d42f554"
+  integrity sha512-wiWio1yVRg2Oj6WEWsTHQo5eSzYpEwSBtPSi3OofNpvFbf26HFfb9kw4FZJNjII4qxzp0b1xLB11+tKkBGB1ZA==
 
 through2@^2.0.1, through2@~2.0.0:
   version "2.0.5"
@@ -10044,15 +10507,7 @@ through2@^2.0.1, through2@~2.0.0:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through2@^3.0.0, through2@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
-  integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "2 || 3"
-
-"through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
+through@^2.3.4, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@@ -10067,11 +10522,6 @@ timed-out@^2.0.0:
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-2.0.0.tgz#f38b0ae81d3747d628001f41dafc652ace671c0a"
   integrity sha1-84sK6B03R9YoAB9B2vxlKs5nHAo=
 
-timed-out@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
-
 timers-browserify@^2.0.11:
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
@@ -10115,11 +10565,6 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-to-array@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
-  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
-
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -10184,6 +10629,11 @@ tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
+treeverse@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f"
+  integrity sha512-whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g==
+
 ts-json-schema-generator@^0.68.1:
   version "0.68.1"
   resolved "https://registry.yarnpkg.com/ts-json-schema-generator/-/ts-json-schema-generator-0.68.1.tgz#39cddb11b0d223e9f60febeb01276e1e4c7cb087"
@@ -10365,16 +10815,16 @@ typescript@~3.9.3, typescript@~3.9.5:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
   integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
 
-ua-parser-js@0.7.22:
-  version "0.7.22"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.22.tgz#960df60a5f911ea8f1c818f3747b99c6e177eae3"
-  integrity sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q==
-
 ua-parser-js@^0.7.21:
   version "0.7.24"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.24.tgz#8d3ecea46ed4f1f1d63ec25f17d8568105dc027c"
   integrity sha512-yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw==
 
+ua-parser-js@^0.7.23:
+  version "0.7.28"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31"
+  integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==
+
 uglify-js@^3.1.4:
   version "3.13.5"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz#5d71d6dbba64cf441f32929b1efce7365bb4f113"
@@ -10405,6 +10855,25 @@ uniq@^1.0.0, uniq@^1.0.1:
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
   integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
 
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
+  dependencies:
+    imurmurhash "^0.1.4"
+
+universal-user-agent@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
+  integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
+
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -10428,21 +10897,16 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-untildify@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"
-  integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==
+untildify@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
+  integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
 
 unzip-response@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
   integrity sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=
 
-unzip-response@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
-  integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
-
 upath@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
@@ -10547,12 +11011,19 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+validate-npm-package-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
+  dependencies:
+    builtins "^1.0.3"
+
 validator@^8.0.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/validator/-/validator-8.2.0.tgz#3c1237290e37092355344fef78c231249dab77b9"
   integrity sha512-Yw5wW34fSv5spzTXNkokD6S6/Oq92d8q/t14TqsS3fAiA1RYnxSFSIZ+CY3n6PGGRCq5HhJTSepQvFUS2QUDxA==
 
-vary@~1.1.2:
+vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
@@ -10601,10 +11072,10 @@ vinyl@^1.1.0:
     clone-stats "^0.0.1"
     replace-ext "0.0.1"
 
-vinyl@^2.0.1, vinyl@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
-  integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
+vinyl@^2.0.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
+  integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
   dependencies:
     clone "^2.1.1"
     clone-buffer "^1.0.0"
@@ -10623,6 +11094,11 @@ void-elements@^2.0.0:
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
   integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
+walk-up-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e"
+  integrity sha512-hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg==
+
 walk@^2.3.9:
   version "2.3.14"
   resolved "https://registry.yarnpkg.com/walk/-/walk-2.3.14.tgz#60ec8631cfd23276ae1e7363ce11d626452e1ef3"
@@ -10831,6 +11307,14 @@ which-pm-runs@^1.0.0:
   resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
   integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
 
+which-pm@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-pm/-/which-pm-2.0.0.tgz#8245609ecfe64bf751d0eef2f376d83bf1ddb7ae"
+  integrity sha512-Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w==
+  dependencies:
+    load-yaml-file "^0.2.0"
+    path-exists "^4.0.0"
+
 which-typed-array@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff"
@@ -10844,7 +11328,7 @@ which-typed-array@^1.1.2:
     has-symbols "^1.0.1"
     is-typed-array "^1.1.3"
 
-which@2.0.2, which@^2.0.1:
+which@2.0.2, which@^2.0.1, which@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
@@ -10870,15 +11354,6 @@ wildcard@^2.0.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
   integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
 
-with-open-file@^0.1.6:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/with-open-file/-/with-open-file-0.1.7.tgz#e2de8d974e8a8ae6e58886be4fe8e7465b58a729"
-  integrity sha512-ecJS2/oHtESJ1t3ZfMI3B7KIDKyfN0O16miWxdn30zdh66Yd3LsRFebXZXq6GU4xfxLf6nVxp9kIqElb5fqczA==
-  dependencies:
-    p-finally "^1.0.0"
-    p-try "^2.1.0"
-    pify "^4.0.1"
-
 word-wrap@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -10912,12 +11387,21 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^3.0.0:
+write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
   integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
@@ -10928,23 +11412,16 @@ write-file-atomic@^3.0.0:
     typedarray-to-buffer "^3.1.5"
 
 ws@^6.1.0, ws@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
+  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.1.2:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz#a5dd76a24197940d4a8bb9e0e152bb4503764da7"
-  integrity sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==
-
-ws@~6.1.0:
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
-  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
-  dependencies:
-    async-limiter "~1.0.0"
+ws@~7.4.2:
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
+  integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==
 
 xhr@^2.0.1:
   version "2.5.0"
@@ -10974,20 +11451,20 @@ xmlbuilder@~11.0.0:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
   integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
 
-xmlhttprequest-ssl@~1.5.4:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
-  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
-
 xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
+  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
+
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
 yallist@^4.0.0:
   version "4.0.0"
@@ -11015,6 +11492,11 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^20.2.2:
+  version "20.2.7"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"
+  integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==
+
 yargs-unparser@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
@@ -11058,6 +11540,19 @@ yargs@^15.0.2, yargs@^15.3.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+yargs@^16.1.1:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
@@ -11066,84 +11561,74 @@ yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-yeast@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
-
-yeoman-environment@^2.10.0, yeoman-environment@^2.9.5:
-  version "2.10.3"
-  resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-2.10.3.tgz#9d8f42b77317414434cc0e51fb006a4bdd54688e"
-  integrity sha512-pLIhhU9z/G+kjOXmJ2bPFm3nejfbH+f1fjYRSOteEXDBrv1EoJE/e+kuHixSXfCYfTkxjYsvRaDX+1QykLCnpQ==
-  dependencies:
-    chalk "^2.4.1"
-    debug "^3.1.0"
-    diff "^3.5.0"
-    escape-string-regexp "^1.0.2"
-    execa "^4.0.0"
-    globby "^8.0.1"
-    grouped-queue "^1.1.0"
-    inquirer "^7.1.0"
-    is-scoped "^1.0.0"
+yeoman-environment@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-3.4.1.tgz#b0591790f90c31bb85c55378931041e8055343c9"
+  integrity sha512-Bu3kN5sTOyAcbO/cKEQf6KOxsLta9oRF59saLOKnt3OQM+hXapnWaAHcrat3dygd6l34KjxwM5AMJp09TDa8yw==
+  dependencies:
+    "@npmcli/arborist" "^2.2.2"
+    are-we-there-yet "^1.1.5"
+    arrify "^2.0.1"
+    binaryextensions "^4.15.0"
+    chalk "^4.1.0"
+    cli-table "^0.3.1"
+    commander "7.1.0"
+    dateformat "^4.5.0"
+    debug "^4.1.1"
+    diff "^5.0.0"
+    error "^10.4.0"
+    escape-string-regexp "^4.0.0"
+    execa "^5.0.0"
+    find-up "^5.0.0"
+    globby "^11.0.1"
+    grouped-queue "^2.0.0"
+    inquirer "^8.0.0"
+    is-scoped "^2.1.0"
     lodash "^4.17.10"
-    log-symbols "^2.2.0"
-    mem-fs "^1.1.0"
-    mem-fs-editor "^6.0.0"
-    npm-api "^1.0.0"
+    log-symbols "^4.0.0"
+    mem-fs "^1.2.0 || ^2.0.0"
+    mem-fs-editor "^8.1.2 || ^9.0.0"
+    minimatch "^3.0.4"
+    npmlog "^4.1.2"
+    p-queue "^6.6.2"
+    pacote "^11.2.6"
+    preferred-pm "^3.0.3"
+    pretty-bytes "^5.3.0"
     semver "^7.1.3"
-    strip-ansi "^4.0.0"
+    slash "^3.0.0"
+    strip-ansi "^6.0.0"
     text-table "^0.2.0"
-    untildify "^3.0.3"
-    yeoman-generator "^4.8.2"
+    textextensions "^5.12.0"
+    untildify "^4.0.0"
 
-yeoman-generator@^4.10.0, yeoman-generator@^4.10.1, yeoman-generator@^4.8.2:
-  version "4.11.0"
-  resolved "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-4.11.0.tgz#c9e2fab77f17a4d7acff571f31e002bc066ed6a8"
-  integrity sha512-++t6t2Z6HjL5F1/UM7+uNvGknKmQdF8tstJx8WKzsUSEpB+19kLVtapSfQIh9uWqm0L59fLWDzUui//WXoynPw==
+yeoman-generator@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-5.2.0.tgz#0260d9472c87d6f32c394f9376900cbcfd6627ba"
+  integrity sha512-LCHaYrcgtC4NpYAkritCEteuDSjBdhsQNYrssZjnK0okRFvroMXDX4//CA1RfVsjCHKi4Df6lILOUYCRiYKG4g==
   dependencies:
-    async "^2.6.2"
-    chalk "^2.4.2"
-    cli-table "^0.3.1"
-    cross-spawn "^6.0.5"
-    dargs "^6.1.0"
-    dateformat "^3.0.3"
+    chalk "^4.1.0"
+    dargs "^7.0.0"
     debug "^4.1.1"
-    diff "^4.0.1"
-    error "^7.0.2"
-    find-up "^3.0.0"
-    github-username "^3.0.0"
-    istextorbinary "^2.5.1"
+    execa "^4.1.0"
+    github-username "^6.0.0"
     lodash "^4.17.11"
-    make-dir "^3.0.0"
-    mem-fs-editor "^7.0.1"
     minimist "^1.2.5"
-    pretty-bytes "^5.2.0"
-    read-chunk "^3.2.0"
-    read-pkg-up "^5.0.0"
-    rimraf "^2.6.3"
+    read-pkg-up "^7.0.1"
     run-async "^2.0.0"
     semver "^7.2.1"
-    shelljs "^0.8.3"
+    shelljs "^0.8.4"
     text-table "^0.2.0"
-    through2 "^3.0.1"
-  optionalDependencies:
-    grouped-queue "^1.1.0"
-    yeoman-environment "^2.9.5"
 
-yeoman-test@^2.6.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/yeoman-test/-/yeoman-test-2.7.0.tgz#c7521b11d95c61d2d756dc14f985d31d1b596e9d"
-  integrity sha512-NNH3XYaeiYO9gWdQ2B02kZuLZnbYZhGqcqrUjyS5VW/r1xOuJ9t6FIzw7uE35/yCx+U9R0kzeTbxkQ6Iwsv3DA==
-  dependencies:
-    inquirer "^7.1.0"
-    lodash "^4.17.15"
-    mem-fs "^1.2.0"
-    mem-fs-editor "^7.0.1"
-    mkdirp "^1.0.3"
-    rimraf "^3.0.2"
-    sinon "^9.0.1"
-    yeoman-environment "^2.10.0"
-    yeoman-generator "^4.10.0"
+yeoman-test@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/yeoman-test/-/yeoman-test-6.1.0.tgz#68a33ae96743c853dcce46fb653950b1b3fcc6d5"
+  integrity sha512-6fCw0gXdvcOX9MQDGdvyEWvtAJ0SskSfJ9S0qPxaW4mm+WtL6IyPAzip2sh/9U0xRoO/krT1Q3DHXk/0kEY0Ww==
+  dependencies:
+    inquirer "^8.0.0"
+    lodash "^4.17.21"
+    mem-fs-editor "^9.0.0"
+    sinon "^10.0.0"
+    temp-dir "^2.0.0"
 
 yn@3.1.1:
   version "3.1.1"