diff --git a/Apps/Sandcastle/gallery/AEC Architectural Design.html b/Apps/Sandcastle/gallery/AEC Architectural Design.html
new file mode 100644
index 00000000000..00e9e76cf14
--- /dev/null
+++ b/Apps/Sandcastle/gallery/AEC Architectural Design.html	
@@ -0,0 +1,234 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
+    <!-- Use Chrome Frame in IE -->
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"
+    />
+    <meta
+      name="description"
+      content="An architectural design model with layer visibility toggles and metadata picking."
+    />
+    <meta name="cesium-sandcastle-labels" content="Showcases, 3D Tiles" />
+    <title>Cesium Demo</title>
+    <script type="text/javascript" src="../Sandcastle-header.js"></script>
+    <script
+      type="text/javascript"
+      src="../../../Build/CesiumUnminified/Cesium.js"
+      nomodule
+    ></script>
+    <script type="module" src="../load-cesium-es6.js"></script>
+  </head>
+  <body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
+    <style>
+      @import url(../templates/bucket.css);
+
+      #toolbar .cesium-button {
+        display: block;
+        width: 100%;
+        text-align: left;
+      }
+    </style>
+    <div id="cesiumContainer" class="fullSize"></div>
+    <div id="loadingOverlay"><h1>Loading...</h1></div>
+    <div id="toolbar"></div>
+    <script id="cesium_sandcastle_script">
+      window.startup = async function (Cesium) {
+        "use strict";
+        //Sandcastle_Begin
+
+        // A demo of an multi-layer Architectural Design with site clipping,
+        // metadata picking and layer visibility toggling.
+        // Snowdon Towers sample data courtesy of Autodesk Revit.
+        const viewer = new Cesium.Viewer("cesiumContainer", {
+          globe: false,
+        });
+
+        // Enable rendering the sky
+        viewer.scene.skyAtmosphere.show = true;
+
+        // Set to 1 PM Philadelphia time in UTC
+        viewer.clock.currentTime = Cesium.JulianDate.fromIso8601("2024-11-22T18:00:00Z");
+
+        // Set the initial camera view
+        viewer.camera.setView({
+          destination: Cesium.Cartesian3.fromDegrees(-79.886626, 40.021649, 235.65),
+          orientation: {
+            heading: 0,
+            pitch: Cesium.Math.toRadians(-20),
+            roll: 0,
+          },
+        });
+
+        // Add Photorealistic 3D tiles
+        let googleTileset;
+        try {
+          googleTileset = await Cesium.Cesium3DTileset.fromIonAssetId(2275207);
+          viewer.scene.primitives.add(googleTileset);
+        } catch (error) {
+          console.log(`Error loading tileset: ${error}`);
+        }
+
+        // Add clipping for the site
+        const positions = Cesium.Cartesian3.fromDegreesArray([
+          -79.887735, 40.022564, -79.886341, 40.023087, -79.886161, 40.023087, -79.885493,
+          40.022032, -79.88703, 40.021456, -79.887735, 40.022564,
+        ]);
+
+        const polygon = new Cesium.ClippingPolygon({
+          positions: positions,
+        });
+
+        const polygons = new Cesium.ClippingPolygonCollection({
+          polygons: [polygon],
+        });
+
+        googleTileset.clippingPolygons = polygons;
+
+        // The Architectural Design is comprised of multiple tilesets
+        const tilesetData = [
+          { title: "Architecture", assetId: 2864367 },
+          { title: "Facade", assetId: 2864370 },
+          { title: "Structural", assetId: 2864375 },
+          { title: "Electrical", assetId: 2864368 },
+          { title: "HVAC", assetId: 2864372 },
+          { title: "Plumbing", assetId: 2864373 },
+          { title: "Site", assetId: 2864374 },
+        ];
+
+        // Load each tileset and create a corresponding visibility toggle button
+        for (const { title, assetId } of tilesetData) {
+          try {
+            const tileset = await Cesium.Cesium3DTileset.fromIonAssetId(assetId);
+            viewer.scene.primitives.add(tileset);
+
+            Sandcastle.addToggleButton(title, true, function (checked) {
+              tileset.show = checked;
+            });
+          } catch (error) {
+            console.log(`Error loading tileset (${title}): ${error}`);
+          }
+        }
+
+        // Get default left click handler for when a feature is not picked on left click
+        const clickHandler = viewer.screenSpaceEventHandler.getInputAction(
+          Cesium.ScreenSpaceEventType.LEFT_CLICK,
+        );
+
+        // Create the HTML that will be put into the info box that shows
+        // information about the currently selected feature
+        function createPickedFeatureDescription(pickedFeature) {
+          let description = `${'<table class="cesium-infoBox-defaultTable"><tbody>'}`;
+
+          const propertyIds = pickedFeature.getPropertyIds();
+
+          // Sort properties alphabetically
+          propertyIds.sort((a, b) => a.localeCompare(b));
+
+          const length = propertyIds.length;
+          for (let i = 0; i < length; ++i) {
+            const propertyId = propertyIds[i];
+            const propertyValue = pickedFeature.getProperty(propertyId);
+
+            // Reject properties with default values
+            if (Cesium.defined(propertyValue) && propertyValue !== "") {
+              description += `<tr><th>${propertyId}</th><td>${propertyValue}</td></tr>`;
+            }
+          }
+
+          description += `</tbody></table>`;
+
+          return description;
+        }
+
+        // An entity object which will hold info about the currently selected feature for infobox display
+        const selectedEntity = new Cesium.Entity();
+
+        // Information about the currently selected feature
+        const selected = {
+          feature: undefined,
+          originalColor: new Cesium.Color(),
+        };
+
+        // Information about the currently highlighted feature
+        const highlighted = {
+          feature: undefined,
+          originalColor: new Cesium.Color(),
+        };
+
+        // Color a feature yellow on hover.
+        viewer.screenSpaceEventHandler.setInputAction(function onMouseMove(movement) {
+          // If a feature was previously highlighted, undo the highlight
+          if (Cesium.defined(highlighted.feature)) {
+            highlighted.feature.color = highlighted.originalColor;
+            highlighted.feature = undefined;
+          }
+          // Pick a new feature
+          const pickedFeature = viewer.scene.pick(movement.endPosition);
+
+          if (
+            !Cesium.defined(pickedFeature) ||
+            !(pickedFeature instanceof Cesium.Cesium3DTileFeature)
+          ) {
+            return;
+          }
+
+          // Highlight the feature if it's not already selected.
+          if (pickedFeature !== selected.feature) {
+            highlighted.feature = pickedFeature;
+            Cesium.Color.clone(pickedFeature.color, highlighted.originalColor);
+            pickedFeature.color = Cesium.Color.YELLOW;
+          }
+        }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+
+        // Color a feature on selection and show metadata in the InfoBox.
+        viewer.screenSpaceEventHandler.setInputAction(function onLeftClick(movement) {
+          // If a feature was previously selected, undo the highlight
+          if (Cesium.defined(selected.feature)) {
+            selected.feature.color = selected.originalColor;
+            selected.feature = undefined;
+          }
+          // Pick a new feature
+          const pickedFeature = viewer.scene.pick(movement.position);
+          if (
+            !Cesium.defined(pickedFeature) ||
+            !(pickedFeature instanceof Cesium.Cesium3DTileFeature)
+          ) {
+            clickHandler(movement);
+            return;
+          }
+          // Select the feature if it's not already selected
+          if (selected.feature === pickedFeature) {
+            return;
+          }
+          selected.feature = pickedFeature;
+          // Save the selected feature's original color
+          if (pickedFeature === highlighted.feature) {
+            Cesium.Color.clone(highlighted.originalColor, selected.originalColor);
+            highlighted.feature = undefined;
+          } else {
+            Cesium.Color.clone(pickedFeature.color, selected.originalColor);
+          }
+          // Highlight newly selected feature
+          pickedFeature.color = Cesium.Color.LIME;
+
+          // Set feature infobox description
+          viewer.selectedEntity = selectedEntity;
+          selectedEntity.description = createPickedFeatureDescription(pickedFeature);
+        }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+        //Sandcastle_End
+      };
+      if (typeof Cesium !== "undefined") {
+        window.startupCalled = true;
+        window.startup(Cesium).catch((error) => {
+          "use strict";
+          console.error(error);
+        });
+        Sandcastle.finishedLoading();
+      }
+    </script>
+  </body>
+</html>
diff --git a/Apps/Sandcastle/gallery/AEC Architectural Design.jpg b/Apps/Sandcastle/gallery/AEC Architectural Design.jpg
new file mode 100644
index 00000000000..e6753bb4f5c
Binary files /dev/null and b/Apps/Sandcastle/gallery/AEC Architectural Design.jpg differ
diff --git a/Apps/Sandcastle/gallery/AEC Isolate by Category.html b/Apps/Sandcastle/gallery/AEC Isolate by Category.html
new file mode 100644
index 00000000000..12c67bd69f8
--- /dev/null
+++ b/Apps/Sandcastle/gallery/AEC Isolate by Category.html	
@@ -0,0 +1,154 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
+    <!-- Use Chrome Frame in IE -->
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"
+    />
+    <meta
+      name="description"
+      content="Isolate elements of an architectural design model by the category."
+    />
+    <meta name="cesium-sandcastle-labels" content="Showcases, 3D Tiles" />
+    <title>Cesium Demo</title>
+    <script type="text/javascript" src="../Sandcastle-header.js"></script>
+    <script
+      type="text/javascript"
+      src="../../../Build/CesiumUnminified/Cesium.js"
+      nomodule
+    ></script>
+    <script type="module" src="../load-cesium-es6.js"></script>
+  </head>
+  <body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
+    <style>
+      @import url(../templates/bucket.css);
+
+      #toolbar .cesium-button {
+        display: block;
+        width: 100%;
+        text-align: left;
+      }
+    </style>
+    <div id="cesiumContainer" class="fullSize"></div>
+    <div id="loadingOverlay"><h1>Loading...</h1></div>
+    <div id="toolbar"></div>
+    <script id="cesium_sandcastle_script">
+      window.startup = async function (Cesium) {
+        "use strict";
+        //Sandcastle_Begin
+
+        // A demo showing how to isolate elements in an architectural design by CategoryID
+        // Snowdon Towers sample data courtesy of Autodesk Revit.
+        const viewer = new Cesium.Viewer("cesiumContainer", {
+          globe: false,
+        });
+
+        // Enable rendering the sky
+        viewer.scene.skyAtmosphere.show = true;
+
+        // Set to 1 PM Philadelphia time in UTC
+        viewer.clock.currentTime = Cesium.JulianDate.fromIso8601("2024-11-22T18:00:00Z");
+
+        // Set the initial camera view
+        viewer.camera.setView({
+          destination: Cesium.Cartesian3.fromDegrees(-79.886626, 40.021649, 235.65),
+          orientation: {
+            heading: 0,
+            pitch: Cesium.Math.toRadians(-20),
+            roll: 0,
+          },
+        });
+
+        // Add Photorealistic 3D tiles
+        let googleTileset;
+        try {
+          googleTileset = await Cesium.Cesium3DTileset.fromIonAssetId(2275207);
+          viewer.scene.primitives.add(googleTileset);
+        } catch (error) {
+          console.log(`Error loading tileset: ${error}`);
+        }
+
+        // Add clipping for the site
+        const positions = Cesium.Cartesian3.fromDegreesArray([
+          -79.887735, 40.022564, -79.886341, 40.023087, -79.886161, 40.023087, -79.885493,
+          40.022032, -79.88703, 40.021456, -79.887735, 40.022564,
+        ]);
+
+        const polygon = new Cesium.ClippingPolygon({
+          positions: positions,
+        });
+
+        const polygons = new Cesium.ClippingPolygonCollection({
+          polygons: [polygon],
+        });
+
+        googleTileset.clippingPolygons = polygons;
+
+        // Add the architectural tileset as a semi-transparent ghost
+        let archTileset;
+        try {
+          archTileset = await Cesium.Cesium3DTileset.fromIonAssetId(2864367);
+          viewer.scene.primitives.add(archTileset);
+        } catch (error) {
+          console.log(`Error loading tileset: ${error}`);
+        }
+
+        // Add the site tileset
+        try {
+          const tileset = await Cesium.Cesium3DTileset.fromIonAssetId(2864374);
+          viewer.scene.primitives.add(tileset);
+        } catch (error) {
+          console.log(`Error loading tileset: ${error}`);
+        }
+
+        // Functions to control styling
+        function showAll() {
+          archTileset.style = new Cesium.Cesium3DTileStyle();
+        }
+
+        function showByCategory(category) {
+          archTileset.style = new Cesium.Cesium3DTileStyle({
+            show: `\${feature['category']} === '${category}'`,
+          });
+        }
+
+        // Add UI buttons to isolate by category
+        Sandcastle.addToolbarButton("Show All", function () {
+          showAll();
+        });
+
+        Sandcastle.addToolbarButton("Isolate Walls", function () {
+          showByCategory(-2000011);
+        });
+
+        Sandcastle.addToolbarButton("Isolate Floors", function () {
+          showByCategory(-2000032);
+        });
+
+        Sandcastle.addToolbarButton("Isolate Stairs", function () {
+          showByCategory(-2000120);
+        });
+
+        Sandcastle.addToolbarButton("Isolate Doors", function () {
+          showByCategory(-2000023);
+        });
+
+        Sandcastle.addToolbarButton("Isolate Lighting", function () {
+          showByCategory(-2001120);
+        });
+        //Sandcastle_End
+      };
+      if (typeof Cesium !== "undefined") {
+        window.startupCalled = true;
+        window.startup(Cesium).catch((error) => {
+          "use strict";
+          console.error(error);
+        });
+        Sandcastle.finishedLoading();
+      }
+    </script>
+  </body>
+</html>
diff --git a/Apps/Sandcastle/gallery/AEC Isolate by Category.jpg b/Apps/Sandcastle/gallery/AEC Isolate by Category.jpg
new file mode 100644
index 00000000000..81f2db7cedf
Binary files /dev/null and b/Apps/Sandcastle/gallery/AEC Isolate by Category.jpg differ
diff --git a/Apps/Sandcastle/gallery/AEC Metadata Styling.html b/Apps/Sandcastle/gallery/AEC Metadata Styling.html
new file mode 100644
index 00000000000..2cc67f49c20
--- /dev/null
+++ b/Apps/Sandcastle/gallery/AEC Metadata Styling.html	
@@ -0,0 +1,194 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
+    <!-- Use Chrome Frame in IE -->
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"
+    />
+    <meta
+      name="description"
+      content="Style an architectural design model based on metadata and an interactive UI."
+    />
+    <meta name="cesium-sandcastle-labels" content="Showcases, 3D Tiles" />
+    <title>Cesium Demo</title>
+    <script type="text/javascript" src="../Sandcastle-header.js"></script>
+    <script
+      type="text/javascript"
+      src="../../../Build/CesiumUnminified/Cesium.js"
+      nomodule
+    ></script>
+    <script type="module" src="../load-cesium-es6.js"></script>
+  </head>
+  <body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
+    <style>
+      @import url(../templates/bucket.css);
+
+      #toolbar {
+        background: rgba(42, 42, 42, 0.8);
+        padding: 4px;
+        border-radius: 4px;
+      }
+
+      .slider {
+        width: 100%;
+      }
+
+      .label {
+        display: block;
+        margin-bottom: 5px;
+      }
+    </style>
+    <div id="cesiumContainer" class="fullSize"></div>
+    <div id="loadingOverlay"><h1>Loading...</h1></div>
+    <div id="toolbar">
+      <div class="slider-container">
+        <label for="minSlider" class="label"
+          >Min Value: <span id="minValue">5</span></label
+        >
+        <input type="range" id="minSlider" class="slider" min="0" max="39" value="5" />
+      </div>
+      <div class="slider-container">
+        <label for="maxSlider" class="label"
+          >Max Value: <span id="maxValue">10</span></label
+        >
+        <input type="range" id="maxSlider" class="slider" min="1" max="40" value="10" />
+      </div>
+    </div>
+    <script id="cesium_sandcastle_script">
+      window.startup = async function (Cesium) {
+        "use strict";
+        //Sandcastle_Begin
+
+        // A demo showing how to style elements of an architectural design dynamically based on embedded metadata and UI input
+        // Snowdon Towers sample data courtesy of Autodesk Revit.
+        const viewer = new Cesium.Viewer("cesiumContainer", {
+          globe: false,
+        });
+
+        // Enable rendering the sky
+        viewer.scene.skyAtmosphere.show = true;
+
+        // Set to 1 PM Philadelphia time in UTC
+        viewer.clock.currentTime = Cesium.JulianDate.fromIso8601("2024-11-22T18:00:00Z");
+
+        // Set the initial camera view
+        viewer.camera.setView({
+          destination: Cesium.Cartesian3.fromDegrees(-79.886626, 40.021649, 235.65),
+          orientation: {
+            heading: 0,
+            pitch: Cesium.Math.toRadians(-20),
+            roll: 0,
+          },
+        });
+
+        // Add Photorealistic 3D tiles
+        let googleTileset;
+        try {
+          googleTileset = await Cesium.Cesium3DTileset.fromIonAssetId(2275207);
+          viewer.scene.primitives.add(googleTileset);
+        } catch (error) {
+          console.log(`Error loading tileset: ${error}`);
+        }
+
+        // Add clipping for the site
+        const positions = Cesium.Cartesian3.fromDegreesArray([
+          -79.887735, 40.022564, -79.886341, 40.023087, -79.886161, 40.023087, -79.885493,
+          40.022032, -79.88703, 40.021456, -79.887735, 40.022564,
+        ]);
+
+        const polygon = new Cesium.ClippingPolygon({
+          positions: positions,
+        });
+
+        const polygons = new Cesium.ClippingPolygonCollection({
+          polygons: [polygon],
+        });
+
+        googleTileset.clippingPolygons = polygons;
+
+        // Add the architectural tileset as a semi-transparent ghost
+        try {
+          const tileset = await Cesium.Cesium3DTileset.fromIonAssetId(2864367);
+          viewer.scene.primitives.add(tileset);
+          tileset.style = new Cesium.Cesium3DTileStyle({
+            color: "color('lightblue', 0.05)",
+          });
+        } catch (error) {
+          console.log(`Error loading tileset: ${error}`);
+        }
+
+        // Add the site tileset
+        try {
+          const tileset = await Cesium.Cesium3DTileset.fromIonAssetId(2864374);
+          viewer.scene.primitives.add(tileset);
+        } catch (error) {
+          console.log(`Error loading tileset: ${error}`);
+        }
+
+        // Add the pipe tileset which will be styled by metadata
+        let pipeTileset;
+        try {
+          pipeTileset = await Cesium.Cesium3DTileset.fromIonAssetId(2864372);
+          pipeTileset.maximumScreenSpaceError = 4;
+          viewer.scene.primitives.add(pipeTileset);
+        } catch (error) {
+          console.log(`Error loading tileset: ${error}`);
+        }
+
+        // Configure the UI
+        const minSlider = document.getElementById("minSlider");
+        const maxSlider = document.getElementById("maxSlider");
+        const minValueDisplay = document.getElementById("minValue");
+        const maxValueDisplay = document.getElementById("maxValue");
+
+        minSlider.oninput = function () {
+          if (parseInt(minSlider.value) > parseInt(maxSlider.value)) {
+            maxSlider.value = minSlider.value; // Adjust max to be the same as min if min exceeds max
+          }
+          minValueDisplay.textContent = minSlider.value;
+          maxValueDisplay.textContent = maxSlider.value;
+          updateHighlighting();
+        };
+
+        maxSlider.oninput = function () {
+          if (parseInt(maxSlider.value) < parseInt(minSlider.value)) {
+            minSlider.value = maxSlider.value; // Adjust min to be the same as max if max is smaller than min
+          }
+          maxValueDisplay.textContent = maxSlider.value;
+          minValueDisplay.textContent = minSlider.value;
+          updateHighlighting();
+        };
+
+        // Update the highlighting of the pipe tileset based on metadata and UI elements
+        function updateHighlighting() {
+          const min = minSlider.value;
+          const max = maxSlider.value;
+          pipeTileset.style = new Cesium.Cesium3DTileStyle({
+            color: {
+              conditions: [
+                [
+                  `(\${length} !== undefined && \${length} >= ${min}) && (\${length} <= ${max})`,
+                  'color("red")',
+                ],
+              ],
+            },
+          });
+        }
+
+        updateHighlighting();
+        //Sandcastle_End
+      };
+      if (typeof Cesium !== "undefined") {
+        window.startupCalled = true;
+        window.startup(Cesium).catch((error) => {
+          "use strict";
+          console.error(error);
+        });
+        Sandcastle.finishedLoading();
+      }
+    </script>
+  </body>
+</html>
diff --git a/Apps/Sandcastle/gallery/AEC Metadata Styling.jpg b/Apps/Sandcastle/gallery/AEC Metadata Styling.jpg
new file mode 100644
index 00000000000..4fa9750411e
Binary files /dev/null and b/Apps/Sandcastle/gallery/AEC Metadata Styling.jpg differ
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 46b59573acf..bc8598aeda7 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -168,6 +168,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
   - [Siddhesh Ranade](https://github.com/siddheshranade)
   - [Adam Morris](https://github.com/weegeekps)
   - [Luke McKinstry](https://github.com/lukemckinstry)
+  - [Ryan Veenstra](https://github.com/r-veenstra)
 - [Northrop Grumman](http://www.northropgrumman.com)
   - [Joseph Stein](https://github.com/nahgrin)
 - [EOX IT Services GmbH](https://eox.at)
