diff --git a/src/data/bucket/fill_extrusion_bucket.js b/src/data/bucket/fill_extrusion_bucket.js
index 70a4e20810e..3f5ab924c33 100644
--- a/src/data/bucket/fill_extrusion_bucket.js
+++ b/src/data/bucket/fill_extrusion_bucket.js
@@ -300,8 +300,8 @@ class FillExtrusionBucket implements Bucket {
     }
 
     addFeature(feature: BucketFeature, geometry: Array<Array<Point>>, index: number, canonical: CanonicalTileID, imagePositions: {[_: string]: ImagePosition}) {
-        const flatRoof = this.enableTerrain && feature.properties && feature.properties.hasOwnProperty('type') &&
-            feature.properties.hasOwnProperty('height') && vectorTileFeatureTypes[feature.type] === 'Polygon';
+        const flatRoof = this.enableTerrain && feature.properties &&
+            vectorTileFeatureTypes[feature.type] === 'Polygon';
 
         const metadata = flatRoof ? new PartMetadata() : null;
 
diff --git a/src/render/draw_fill_extrusion.js b/src/render/draw_fill_extrusion.js
index 35d8db33df4..43ef5ff5fab 100644
--- a/src/render/draw_fill_extrusion.js
+++ b/src/render/draw_fill_extrusion.js
@@ -139,17 +139,22 @@ function flatRoofsUpdate(context, source, coord, bucket, layer, terrain) {
 
     const getLoadedBucket = (nid) => {
         const maxzoom = source.getSource().maxzoom;
-        // In overscale range, look one tile zoom above and under. We do this to
-        // avoid flickering and use the content in Z-1 and Z+1 buckets until Z bucket is loaded.
-        for (const j of [0, -1, 1]) {
-            if (nid.overscaledZ + j < maxzoom) continue;
-            if (j > 0 && nid.overscaledZ < maxzoom) continue;
-            const n = source.getTileByID(nid.calculateScaledKey(nid.overscaledZ + j));
+        const getBucket = (key) => {
+            const n = source.getTileByID(key);
             if (n && n.hasData()) {
-                const nBucket: ?FillExtrusionBucket = (n.getBucket(layer): any);
-                if (nBucket) return nBucket;
+                return n.getBucket(layer);
             }
-        }
+        };
+        // In overscale range, we look one tile zoom above and under. We do this to avoid
+        // flickering and use the content in Z-1 and Z+1 buckets until Z bucket is loaded.
+        let b0, b1, b2;
+        if (nid.overscaledZ === nid.canonical.z || nid.overscaledZ >= maxzoom)
+            b0 = getBucket(nid.key);
+        if (nid.overscaledZ >= maxzoom)
+            b1 = getBucket(nid.calculateScaledKey(nid.overscaledZ + 1));
+        if (nid.overscaledZ > maxzoom)
+            b2 = getBucket(nid.calculateScaledKey(nid.overscaledZ - 1));
+        return b0 || b1 || b2;
     };
 
     const projectedToBorder = [0, 0, 0]; // [min, max, maxOffsetFromBorder]
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#10170/expected.png b/test/integration/render-tests/regressions/mapbox-gl-js#10170/expected.png
new file mode 100644
index 00000000000..e9cc8eaa670
Binary files /dev/null and b/test/integration/render-tests/regressions/mapbox-gl-js#10170/expected.png differ
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#10170/style.json b/test/integration/render-tests/regressions/mapbox-gl-js#10170/style.json
new file mode 100644
index 00000000000..400bb2a708b
--- /dev/null
+++ b/test/integration/render-tests/regressions/mapbox-gl-js#10170/style.json
@@ -0,0 +1,1335 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "height": 256,
+      "width": 512,
+      "operations": [
+        ["wait"]
+      ]
+    }
+  },
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "buffer": 0,
+      "data": {
+        "type":"FeatureCollection",
+        "features":[
+          {
+            "type":"Feature",
+            "properties":{
+              "type":"building",
+              "building_height":112.77,
+              "roof_clr":null
+            },
+            "geometry":{
+              "type":"MultiPolygon",
+              "coordinates":[
+                [
+                  [
+                    [
+                      151.179891382000022,
+                      -33.798640395,
+                      98.585998535
+                    ],
+                    [
+                      151.179925174,
+                      -33.798715024,
+                      100.218002319
+                    ],
+                    [
+                      151.17981930800002,
+                      -33.798748435,
+                      96.36000061
+                    ],
+                    [
+                      151.179850163,
+                      -33.798816577,
+                      95.060997009
+                    ],
+                    [
+                      151.17995602900001,
+                      -33.798783166,
+                      99.56199646
+                    ],
+                    [
+                      151.179988150000014,
+                      -33.798854105,
+                      98.813003540000011
+                    ],
+                    [
+                      151.179882284,
+                      -33.798887517,
+                      94.037002563
+                    ],
+                    [
+                      151.179899407000022,
+                      -33.798925332,
+                      96.273002625
+                    ],
+                    [
+                      151.179454828000019,
+                      -33.79906564,
+                      98.968002319
+                    ],
+                    [
+                      151.179435004,
+                      -33.799021858,
+                      96.350997925
+                    ],
+                    [
+                      151.179407814,
+                      -33.79896181,
+                      95.343002319
+                    ],
+                    [
+                      151.179391527,
+                      -33.79892584,
+                      96.191001892
+                    ],
+                    [
+                      151.179387204000022,
+                      -33.798927205,
+                      96.191001892
+                    ],
+                    [
+                      151.179339764000019,
+                      -33.798822434,
+                      98.537002563
+                    ],
+                    [
+                      151.179321591000019,
+                      -33.798782299,
+                      99.717002869000012
+                    ],
+                    [
+                      151.179770492000017,
+                      -33.798640626,
+                      97.200996399
+                    ],
+                    [
+                      151.17978551600001,
+                      -33.798673807,
+                      97.03099823
+                    ],
+                    [
+                      151.179891382000022,
+                      -33.798640395,
+                      98.585998535
+                    ]
+                  ]
+                ]
+              ]
+            }
+          },
+          {
+            "type":"Feature",
+            "properties":{
+              "type":"building",
+              "building_height":70.38,
+              "roof_clr":null
+            },
+            "geometry":{
+              "type":"MultiPolygon",
+              "coordinates":[
+                [
+                  [
+                    [
+                      151.179441146000016,
+                      -33.796675354,
+                      103.892997742
+                    ],
+                    [
+                      151.179534864,
+                      -33.79688206,
+                      101.037002563
+                    ],
+                    [
+                      151.179584545000012,
+                      -33.796866662,
+                      101.100997925
+                    ],
+                    [
+                      151.17958596,
+                      -33.796866239,
+                      101.100997925
+                    ],
+                    [
+                      151.179587515,
+                      -33.796866015,
+                      101.100997925
+                    ],
+                    [
+                      151.179589145000023,
+                      -33.796866029,
+                      101.019996643000013
+                    ],
+                    [
+                      151.179590774000019,
+                      -33.796866297,
+                      101.019996643000013
+                    ],
+                    [
+                      151.179592315,
+                      -33.796866814,
+                      101.019996643000013
+                    ],
+                    [
+                      151.179593691,
+                      -33.796867545,
+                      101.019996643000013
+                    ],
+                    [
+                      151.179594848000022,
+                      -33.79686844,
+                      101.019996643000013
+                    ],
+                    [
+                      151.179595758,
+                      -33.796869439,
+                      100.856002808
+                    ],
+                    [
+                      151.179679796000016,
+                      -33.797056842,
+                      103.749000549
+                    ],
+                    [
+                      151.179680372,
+                      -33.797058115,
+                      103.749000549
+                    ],
+                    [
+                      151.179680693000023,
+                      -33.797059523,
+                      103.911003113
+                    ],
+                    [
+                      151.179680697,
+                      -33.797061008,
+                      103.911003113
+                    ],
+                    [
+                      151.179680358000013,
+                      -33.797062494,
+                      103.911003113
+                    ],
+                    [
+                      151.179679684,
+                      -33.797063898,
+                      103.911003113
+                    ],
+                    [
+                      151.179678721000016,
+                      -33.797065146,
+                      103.911003113
+                    ],
+                    [
+                      151.17967754,
+                      -33.797066188,
+                      103.911003113
+                    ],
+                    [
+                      151.179676227000016,
+                      -33.797066994,
+                      103.911003113
+                    ],
+                    [
+                      151.179622182,
+                      -33.797083763,
+                      104.583999634
+                    ],
+                    [
+                      151.179641731,
+                      -33.797126897,
+                      104.660003662
+                    ],
+                    [
+                      151.17964223300001,
+                      -33.797128031,
+                      104.660003662
+                    ],
+                    [
+                      151.179642442000016,
+                      -33.797129334,
+                      104.660003662
+                    ],
+                    [
+                      151.179642271,
+                      -33.79713072,
+                      104.660003662
+                    ],
+                    [
+                      151.179641681000021,
+                      -33.797132071,
+                      104.662002563
+                    ],
+                    [
+                      151.179640709000012,
+                      -33.797133257,
+                      104.662002563
+                    ],
+                    [
+                      151.179639458,
+                      -33.79713418,
+                      104.662002563
+                    ],
+                    [
+                      151.179638067000013,
+                      -33.797134795,
+                      104.662002563
+                    ],
+                    [
+                      151.17963667,
+                      -33.797135114,
+                      104.518997192
+                    ],
+                    [
+                      151.179584187000017,
+                      -33.797151795,
+                      104.320999146
+                    ],
+                    [
+                      151.179604694,
+                      -33.79719628,
+                      104.021003723
+                    ],
+                    [
+                      151.179605118000012,
+                      -33.797197471,
+                      104.021003723
+                    ],
+                    [
+                      151.179605279000015,
+                      -33.797198779,
+                      104.021003723
+                    ],
+                    [
+                      151.17960512800002,
+                      -33.797200142,
+                      104.021003723
+                    ],
+                    [
+                      151.179604643,
+                      -33.797201478,
+                      104.021003723
+                    ],
+                    [
+                      151.17960384600002,
+                      -33.797202706,
+                      103.819999695
+                    ],
+                    [
+                      151.179602792,
+                      -33.797203754,
+                      103.948997498000011
+                    ],
+                    [
+                      151.179601564000023,
+                      -33.797204578,
+                      103.948997498000011
+                    ],
+                    [
+                      151.179600251000011,
+                      -33.797205164,
+                      103.948997498000011
+                    ],
+                    [
+                      151.179375391,
+                      -33.797276777,
+                      104.578002930000011
+                    ],
+                    [
+                      151.179374072,
+                      -33.797277053,
+                      104.65100097700001
+                    ],
+                    [
+                      151.179372635000021,
+                      -33.797277124,
+                      104.65100097700001
+                    ],
+                    [
+                      151.179371152000016,
+                      -33.797276953,
+                      104.65100097700001
+                    ],
+                    [
+                      151.17936971,
+                      -33.797276526,
+                      104.65100097700001
+                    ],
+                    [
+                      151.179368402000023,
+                      -33.797275862,
+                      104.65100097700001
+                    ],
+                    [
+                      151.179367306000017,
+                      -33.797275011,
+                      104.65100097700001
+                    ],
+                    [
+                      151.179366463,
+                      -33.797274037,
+                      104.65100097700001
+                    ],
+                    [
+                      151.179365888,
+                      -33.797273009,
+                      104.65100097700001
+                    ],
+                    [
+                      151.179282160000014,
+                      -33.79708321,
+                      104.888000488
+                    ],
+                    [
+                      151.179282072,
+                      -33.797081154,
+                      104.908996582
+                    ],
+                    [
+                      151.179282605,
+                      -33.79707908,
+                      104.86000061
+                    ],
+                    [
+                      151.179283736,
+                      -33.79707718,
+                      104.86000061
+                    ],
+                    [
+                      151.179285338,
+                      -33.79707562,
+                      104.86000061
+                    ],
+                    [
+                      151.179337086,
+                      -33.797059258,
+                      104.903999329
+                    ],
+                    [
+                      151.179317710000021,
+                      -33.797016941,
+                      104.876998901
+                    ],
+                    [
+                      151.179317282,
+                      -33.797015566,
+                      104.876998901
+                    ],
+                    [
+                      151.179317068000017,
+                      -33.797014116,
+                      104.876998901
+                    ],
+                    [
+                      151.179317092000019,
+                      -33.797012627,
+                      104.876998901
+                    ],
+                    [
+                      151.179317363,
+                      -33.797011141,
+                      104.876998901
+                    ],
+                    [
+                      151.179317879,
+                      -33.797009701,
+                      104.876998901
+                    ],
+                    [
+                      151.179318618,
+                      -33.797008347,
+                      104.839996338
+                    ],
+                    [
+                      151.179319553,
+                      -33.797007111,
+                      104.839996338
+                    ],
+                    [
+                      151.179320644,
+                      -33.79700602,
+                      104.839996338
+                    ],
+                    [
+                      151.179375704000023,
+                      -33.796988571,
+                      104.88600158700001
+                    ],
+                    [
+                      151.179356155000022,
+                      -33.79694463,
+                      104.891998291
+                    ],
+                    [
+                      151.17935628,
+                      -33.796943205,
+                      104.891998291
+                    ],
+                    [
+                      151.179356653000013,
+                      -33.796941764,
+                      104.891998291
+                    ],
+                    [
+                      151.179357281000023,
+                      -33.796940353,
+                      104.891998291
+                    ],
+                    [
+                      151.179358156,
+                      -33.796939018,
+                      104.891998291
+                    ],
+                    [
+                      151.179359255,
+                      -33.796937803,
+                      104.891998291
+                    ],
+                    [
+                      151.179360538,
+                      -33.796936745,
+                      104.876998901
+                    ],
+                    [
+                      151.179361958000015,
+                      -33.796935869,
+                      104.856002808
+                    ],
+                    [
+                      151.179363463000016,
+                      -33.796935187,
+                      104.856002808
+                    ],
+                    [
+                      151.179424195,
+                      -33.796916362,
+                      104.555999756
+                    ],
+                    [
+                      151.179340647,
+                      -33.796882398,
+                      104.880996704000012
+                    ],
+                    [
+                      151.179339065000022,
+                      -33.796881584,
+                      104.911003113
+                    ],
+                    [
+                      151.179337607,
+                      -33.796880494,
+                      104.911003113
+                    ],
+                    [
+                      151.179336373000012,
+                      -33.796879151,
+                      104.911003113
+                    ],
+                    [
+                      151.17933545,
+                      -33.796877608,
+                      104.911003113
+                    ],
+                    [
+                      151.179334900000015,
+                      -33.796875946,
+                      104.911003113
+                    ],
+                    [
+                      151.17933474,
+                      -33.796874258,
+                      104.911003113
+                    ],
+                    [
+                      151.179334949,
+                      -33.796872634,
+                      104.912002563
+                    ],
+                    [
+                      151.179335473,
+                      -33.796871145,
+                      104.912002563
+                    ],
+                    [
+                      151.179441146000016,
+                      -33.796675354,
+                      103.892997742
+                    ]
+                  ]
+                ]
+              ]
+            }
+          },
+          {
+            "type":"Feature",
+            "properties":{
+              "type":"building",
+              "building_height":67.51,
+              "roof_clr":null
+            },
+            "geometry":{
+              "type":"MultiPolygon",
+              "coordinates":[
+                [
+                  [
+                    [
+                      151.181804339,
+                      -33.797903044,
+                      94.804000854
+                    ],
+                    [
+                      151.181818204,
+                      -33.797933895,
+                      94.769996643
+                    ],
+                    [
+                      151.181833674000018,
+                      -33.797929049,
+                      94.79599762
+                    ],
+                    [
+                      151.181879467000016,
+                      -33.798030944,
+                      94.339996338
+                    ],
+                    [
+                      151.18186298400002,
+                      -33.798036108,
+                      94.358001709
+                    ],
+                    [
+                      151.181912794,
+                      -33.79814694,
+                      93.942001343
+                    ],
+                    [
+                      151.181929277000023,
+                      -33.798141776,
+                      93.83300018300001
+                    ],
+                    [
+                      151.181974815000018,
+                      -33.798243106,
+                      93.31199646
+                    ],
+                    [
+                      151.181958048000013,
+                      -33.798248358,
+                      93.310997009
+                    ],
+                    [
+                      151.181971922,
+                      -33.798279231,
+                      93.211997986
+                    ],
+                    [
+                      151.181765444,
+                      -33.798343909,
+                      93.994003296
+                    ],
+                    [
+                      151.181751449000018,
+                      -33.798312769,
+                      94.248001099
+                    ],
+                    [
+                      151.181720228000017,
+                      -33.798322549,
+                      94.233001709
+                    ],
+                    [
+                      151.181705887000021,
+                      -33.798290641,
+                      94.313003540000011
+                    ],
+                    [
+                      151.181673079,
+                      -33.798300918,
+                      94.289001465000013
+                    ],
+                    [
+                      151.181659595000013,
+                      -33.798270917,
+                      94.406997681
+                    ],
+                    [
+                      151.181627822,
+                      -33.798280869,
+                      94.512001038
+                    ],
+                    [
+                      151.181541605,
+                      -33.798089024,
+                      95.974998474
+                    ],
+                    [
+                      151.181573378,
+                      -33.798079071,
+                      96.070999146
+                    ],
+                    [
+                      151.181559215000021,
+                      -33.798047556,
+                      96.007003784
+                    ],
+                    [
+                      151.181592025000015,
+                      -33.798037278,
+                      95.977996826
+                    ],
+                    [
+                      151.181578840000014,
+                      -33.798007942,
+                      95.76499939
+                    ],
+                    [
+                      151.181610062,
+                      -33.797998162,
+                      95.499000549
+                    ],
+                    [
+                      151.181596565,
+                      -33.797968128,
+                      95.22699737500001
+                    ],
+                    [
+                      151.181705737000016,
+                      -33.79793393,
+                      94.632003784
+                    ],
+                    [
+                      151.181804339,
+                      -33.797903044,
+                      94.804000854
+                    ]
+                  ]
+                ]
+              ]
+            }
+          },
+          {
+            "type":"Feature",
+            "properties":{
+              "type":"building",
+              "building_height":136.24,
+              "roof_clr":null
+            },
+            "geometry":{
+              "type":"MultiPolygon",
+              "coordinates":[
+                [
+                  [
+                    [
+                      151.180478744,
+                      -33.794997459,
+                      95.322998047000013
+                    ],
+                    [
+                      151.18065175000001,
+                      -33.795029696,
+                      94.93699646
+                    ],
+                    [
+                      151.180790536000018,
+                      -33.795010524,
+                      94.339996338
+                    ],
+                    [
+                      151.180790301,
+                      -33.795253595,
+                      93.90599823
+                    ],
+                    [
+                      151.180819902,
+                      -33.795408804,
+                      93.217002869000012
+                    ],
+                    [
+                      151.180819931,
+                      -33.795408954,
+                      93.217002869000012
+                    ],
+                    [
+                      151.180769788000021,
+                      -33.795416501,
+                      93.268997192
+                    ],
+                    [
+                      151.180579757,
+                      -33.795436288,
+                      94.293998718000012
+                    ],
+                    [
+                      151.180573469000024,
+                      -33.795436579,
+                      94.293998718000012
+                    ],
+                    [
+                      151.180567174,
+                      -33.795436727,
+                      94.42400360100001
+                    ],
+                    [
+                      151.180560876000015,
+                      -33.79543673,
+                      94.42400360100001
+                    ],
+                    [
+                      151.18055458,
+                      -33.795436589,
+                      94.555000305
+                    ],
+                    [
+                      151.180548290000019,
+                      -33.795436304,
+                      94.555000305
+                    ],
+                    [
+                      151.180542013,
+                      -33.795435876,
+                      94.685997009
+                    ],
+                    [
+                      151.180535752,
+                      -33.795435303,
+                      94.817001343
+                    ],
+                    [
+                      151.180529512000021,
+                      -33.795434586,
+                      94.817001343
+                    ],
+                    [
+                      151.180523297,
+                      -33.795433728,
+                      94.947998047000013
+                    ],
+                    [
+                      151.180520547000015,
+                      -33.795433302,
+                      94.947998047000013
+                    ],
+                    [
+                      151.18051683600001,
+                      -33.795432645,
+                      94.947998047000013
+                    ],
+                    [
+                      151.180513162000011,
+                      -33.795431848,
+                      95.07900238
+                    ],
+                    [
+                      151.180509537,
+                      -33.795430912,
+                      95.07900238
+                    ],
+                    [
+                      151.180505966,
+                      -33.79542984,
+                      95.12100219700001
+                    ],
+                    [
+                      151.180502457000017,
+                      -33.795428633,
+                      95.269996643
+                    ],
+                    [
+                      151.180499017000017,
+                      -33.795427294,
+                      95.269996643
+                    ],
+                    [
+                      151.180495654,
+                      -33.795425826,
+                      95.269996643
+                    ],
+                    [
+                      151.180492374000011,
+                      -33.795424231,
+                      95.399002075000013
+                    ],
+                    [
+                      151.180489185,
+                      -33.795422514,
+                      95.399002075000013
+                    ],
+                    [
+                      151.180486091,
+                      -33.795420678,
+                      95.34400177
+                    ],
+                    [
+                      151.180483101000021,
+                      -33.795418725,
+                      95.467002869000012
+                    ],
+                    [
+                      151.18048022100001,
+                      -33.795416662,
+                      95.467002869000012
+                    ],
+                    [
+                      151.180477995000018,
+                      -33.79541493,
+                      95.467002869000012
+                    ],
+                    [
+                      151.18047523300001,
+                      -33.795412357,
+                      95.467002869000012
+                    ],
+                    [
+                      151.180472603,
+                      -33.795409689,
+                      95.446998596
+                    ],
+                    [
+                      151.180470108,
+                      -33.795406933,
+                      95.446998596
+                    ],
+                    [
+                      151.180467753000016,
+                      -33.795404091,
+                      95.446998596
+                    ],
+                    [
+                      151.180465542,
+                      -33.79540117,
+                      95.447998047000013
+                    ],
+                    [
+                      151.180463479,
+                      -33.795398175,
+                      95.447998047000013
+                    ],
+                    [
+                      151.180461567,
+                      -33.79539511,
+                      95.40599823
+                    ],
+                    [
+                      151.18045981100002,
+                      -33.795391981,
+                      95.429000854
+                    ],
+                    [
+                      151.180458212000019,
+                      -33.795388794,
+                      95.429000854
+                    ],
+                    [
+                      151.180456774000021,
+                      -33.795385554,
+                      95.429000854
+                    ],
+                    [
+                      151.180455500000022,
+                      -33.795382267,
+                      95.391998291
+                    ],
+                    [
+                      151.180454391000012,
+                      -33.795378938,
+                      95.391998291
+                    ],
+                    [
+                      151.180453605,
+                      -33.795376176,
+                      95.391998291
+                    ],
+                    [
+                      151.180451784000013,
+                      -33.795370183,
+                      95.39099884
+                    ],
+                    [
+                      151.180450132,
+                      -33.795364158,
+                      95.37100219700001
+                    ],
+                    [
+                      151.180448649,
+                      -33.795358101,
+                      95.37100219700001
+                    ],
+                    [
+                      151.180447336000015,
+                      -33.795352018,
+                      95.369003296
+                    ],
+                    [
+                      151.180446191000016,
+                      -33.795345909,
+                      95.343002319
+                    ],
+                    [
+                      151.180445219,
+                      -33.795339781,
+                      95.343002319
+                    ],
+                    [
+                      151.180444418,
+                      -33.795333636,
+                      95.319999695
+                    ],
+                    [
+                      151.18044379,
+                      -33.795327477,
+                      95.297996521
+                    ],
+                    [
+                      151.180443334000017,
+                      -33.795321306,
+                      95.297996521
+                    ],
+                    [
+                      151.180443049000019,
+                      -33.795315129,
+                      95.258003235
+                    ],
+                    [
+                      151.180442957,
+                      -33.795311141,
+                      95.252998352
+                    ],
+                    [
+                      151.180439115000013,
+                      -33.795018853,
+                      95.200996399
+                    ],
+                    [
+                      151.180481249,
+                      -33.795017802,
+                      95.152000427
+                    ],
+                    [
+                      151.180478744,
+                      -33.794997459,
+                      95.322998047000013
+                    ]
+                  ]
+                ]
+              ]
+            }
+          },
+          {
+            "type":"Feature",
+            "properties":{
+              "type":"building",
+              "building_height":129.31,
+              "roof_clr":null
+            },
+            "geometry":{
+              "type":"MultiPolygon",
+              "coordinates":[
+                [
+                  [
+                    [
+                      151.179984166,
+                      -33.798194654,
+                      99.180999756
+                    ],
+                    [
+                      151.180260324000017,
+                      -33.798815113,
+                      98.138999939
+                    ],
+                    [
+                      151.180207945,
+                      -33.798831644,
+                      98.36699676500001
+                    ],
+                    [
+                      151.180204635,
+                      -33.798824333,
+                      98.32900238
+                    ],
+                    [
+                      151.180195424,
+                      -33.798827241,
+                      98.367996216
+                    ],
+                    [
+                      151.180198734000015,
+                      -33.798834552,
+                      98.39099884
+                    ],
+                    [
+                      151.180125793,
+                      -33.798857572,
+                      98.755996704000012
+                    ],
+                    [
+                      151.180120150000022,
+                      -33.798845109,
+                      98.76499939
+                    ],
+                    [
+                      151.180111173,
+                      -33.798847942,
+                      98.819999695
+                    ],
+                    [
+                      151.180116816,
+                      -33.798860405,
+                      98.841003418
+                    ],
+                    [
+                      151.180042422000014,
+                      -33.798883883,
+                      99.316001892
+                    ],
+                    [
+                      151.180036779,
+                      -33.798871421,
+                      99.357002258
+                    ],
+                    [
+                      151.180027829000011,
+                      -33.798874246,
+                      99.337997437000013
+                    ],
+                    [
+                      151.180033472000019,
+                      -33.798886708,
+                      99.263999939
+                    ],
+                    [
+                      151.180006733,
+                      -33.798895147,
+                      99.290000916000011
+                    ],
+                    [
+                      151.179988150000014,
+                      -33.798854105,
+                      98.813003540000011
+                    ],
+                    [
+                      151.17995602900001,
+                      -33.798783166,
+                      99.56199646
+                    ],
+                    [
+                      151.17995048100002,
+                      -33.798770915,
+                      99.749000549
+                    ],
+                    [
+                      151.179925174,
+                      -33.798715024,
+                      100.218002319
+                    ],
+                    [
+                      151.179891382000022,
+                      -33.798640395,
+                      98.585998535
+                    ],
+                    [
+                      151.179855579000019,
+                      -33.798651502,
+                      98.119003296
+                    ],
+                    [
+                      151.179693056000019,
+                      -33.798286349,
+                      100.516998291
+                    ],
+                    [
+                      151.179726388,
+                      -33.798276009,
+                      100.519996643000013
+                    ],
+                    [
+                      151.179984166,
+                      -33.798194654,
+                      99.180999756
+                    ]
+                  ]
+                ]
+              ]
+            }
+          },
+          {
+            "type":"Feature",
+            "properties":{
+              "type":"building",
+              "building_height":146.44,
+              "roof_clr":null
+            },
+            "geometry":{
+              "type":"MultiPolygon",
+              "coordinates":[
+                [
+                  [
+                    [
+                      151.181091777,
+                      -33.796936779,
+                      98.49600219700001
+                    ],
+                    [
+                      151.181125024000011,
+                      -33.797641389,
+                      99.223999023
+                    ],
+                    [
+                      151.181073779,
+                      -33.797657011,
+                      99.611000061000013
+                    ],
+                    [
+                      151.180986860000019,
+                      -33.797683507,
+                      100.754997253000013
+                    ],
+                    [
+                      151.180891809,
+                      -33.797712481,
+                      100.70800018300001
+                    ],
+                    [
+                      151.18080261,
+                      -33.797739673,
+                      100.302001953
+                    ],
+                    [
+                      151.180758188,
+                      -33.797753214,
+                      99.832000732000012
+                    ],
+                    [
+                      151.180755418000018,
+                      -33.797696778,
+                      100.04900360100001
+                    ],
+                    [
+                      151.180719802,
+                      -33.797696712,
+                      99.863998413
+                    ],
+                    [
+                      151.180590359,
+                      -33.797300308,
+                      100.527000427
+                    ],
+                    [
+                      151.180553149000019,
+                      -33.797158283,
+                      101.574996948
+                    ],
+                    [
+                      151.180565795,
+                      -33.797154301,
+                      100.990997314000012
+                    ],
+                    [
+                      151.180533325,
+                      -33.797082426,
+                      102.102996826
+                    ],
+                    [
+                      151.180647617,
+                      -33.797046436,
+                      93.925003052
+                    ],
+                    [
+                      151.180653,
+                      -33.797058353,
+                      93.933998108000011
+                    ],
+                    [
+                      151.180766245,
+                      -33.797071854,
+                      99.619003296
+                    ],
+                    [
+                      151.180769744,
+                      -33.797035777,
+                      99.27999877900001
+                    ],
+                    [
+                      151.18081255200002,
+                      -33.797022618,
+                      99.842002869000012
+                    ],
+                    [
+                      151.180876806000015,
+                      -33.797002865,
+                      100.707000732000012
+                    ],
+                    [
+                      151.180973725,
+                      -33.79697307,
+                      100.755996704000012
+                    ],
+                    [
+                      151.181040634,
+                      -33.796952502,
+                      100.72699737500001
+                    ],
+                    [
+                      151.181091777,
+                      -33.796936779,
+                      98.49600219700001
+                    ]
+                  ]
+                ]
+              ]
+            }
+          }
+        ]
+      }
+    },
+    "rgbterrain": {
+      "type": "raster-dem",
+      "tiles": [
+        "local://tiles/{z}-{x}-{y}.terrain.png"
+      ],
+      "maxzoom": 14,
+      "tileSize": 512
+    }
+  },
+  "terrain": {
+    "source": "rgbterrain",
+    "exaggeration": 2
+  },
+  "pitch": 70,
+  "zoom": 15.5,
+  "bearing": 45,
+  "center": [151.18020762443382, -33.79757248908901],
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "beige"
+      }
+    },
+    {
+      "id": "extrusion",
+      "type": "fill-extrusion",
+      "source": "geojson",
+      "paint": {
+        "fill-extrusion-opacity": 0.5,
+        "fill-extrusion-height": ["get", "building_height"],
+        "fill-extrusion-color": [
+          "case",
+          ["!=", ["get", "roof_clr"], null],
+          ["get", "roof_clr"],
+          "#909090"
+        ]
+      }
+    },
+    {
+      "id": "hillshade",
+      "type": "hillshade",
+      "source": "rgbterrain"
+    }
+  ]
+}
diff --git a/test/integration/tiles/13-7536-4912.terrain.png b/test/integration/tiles/13-7536-4912.terrain.png
new file mode 100644
index 00000000000..91065fe18d6
Binary files /dev/null and b/test/integration/tiles/13-7536-4912.terrain.png differ
diff --git a/test/integration/tiles/13-7536-4913.terrain.png b/test/integration/tiles/13-7536-4913.terrain.png
new file mode 100644
index 00000000000..d20ce4ec32d
Binary files /dev/null and b/test/integration/tiles/13-7536-4913.terrain.png differ
diff --git a/test/integration/tiles/13-7536-4914.terrain.png b/test/integration/tiles/13-7536-4914.terrain.png
new file mode 100644
index 00000000000..0538ced1102
Binary files /dev/null and b/test/integration/tiles/13-7536-4914.terrain.png differ
diff --git a/test/release/extrusion-query.html b/test/release/extrusion-query.html
new file mode 120000
index 00000000000..3786e99d897
--- /dev/null
+++ b/test/release/extrusion-query.html
@@ -0,0 +1 @@
+../../debug/extrusion-query.html
\ No newline at end of file
diff --git a/test/release/index.js b/test/release/index.js
index 825638deb4f..85c8de4fa86 100644
--- a/test/release/index.js
+++ b/test/release/index.js
@@ -146,6 +146,11 @@ const pages = [
         "title": "Image Source (3d)",
         "inject3d": true
     },
+    {
+        "key": "extrusion-query",
+        "url": "./extrusion-query.html",
+        "title": "Fill extrusion querying with terrain"
+    },
     {
         "key": "3d-playground",
         "title": "3D Playground",