diff --git a/.gitignore b/.gitignore
index 3739bfb42..ed805de79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,4 +44,8 @@ node_modules
 /bazel-*
 CMakeLists.txt.user
 CMakeFiles
-__generated__
\ No newline at end of file
+__generated__
+
+/metrics/integration/query-tests/**/actual.json
+/metrics/integration/render-tests/**/actual.png
+/metrics/integration/render-tests/**/diff.png
diff --git a/include/mbgl/gfx/uniform_block.hpp b/include/mbgl/gfx/uniform_block.hpp
index f56917ee7..ac0014af2 100644
--- a/include/mbgl/gfx/uniform_block.hpp
+++ b/include/mbgl/gfx/uniform_block.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
+#include <mbgl/util/string_indexer.hpp>
+
 #include <string>
 #include <memory>
 #include <unordered_map>
-#include <mbgl/util/string_indexer.hpp>
-
+#include <functional>
 namespace mbgl {
 namespace gfx {
 
diff --git a/metrics/ignores/platform-all.json b/metrics/ignores/platform-all.json
index f331de785..1ce8ff958 100644
--- a/metrics/ignores/platform-all.json
+++ b/metrics/ignores/platform-all.json
@@ -132,5 +132,7 @@
     "render-tests/feature-state/promote-id-fill-extrusion": "https://github.com/mapbox/mapbox-gl-js/pull/9202",
     "render-tests/line-pattern/with-dasharray":"https://github.com/mapbox/mapbox-gl-js/pull/9189",
     "render-tests/symbol-sort-key/placement-tile-boundary-right-then-left": "https://github.com/mapbox/mapbox-gl-js/pull/9054",
-    "render-tests/tile-mode/streets-v11": "ignored due to flaky metrics results"
+    "render-tests/tile-mode/streets-v11": "ignored due to flaky metrics results",
+    "render-tests/combinations/heatmap-translucent--fill-opaque": "Temporarily disabled until the renderer switch",
+    "render-tests/combinations/heatmap-translucent--background-opaque": "Temporarily disabled until the renderer switch"
 }
diff --git a/metrics/integration/render-tests/combinations/heatmap-translucent--background-opaque/expected.png b/metrics/integration/render-tests/combinations/heatmap-translucent--background-opaque/expected.png
index 93ff6561c..5166b4a4f 100644
Binary files a/metrics/integration/render-tests/combinations/heatmap-translucent--background-opaque/expected.png and b/metrics/integration/render-tests/combinations/heatmap-translucent--background-opaque/expected.png differ
diff --git a/metrics/integration/render-tests/combinations/heatmap-translucent--fill-opaque/expected.png b/metrics/integration/render-tests/combinations/heatmap-translucent--fill-opaque/expected.png
index 56ba77a3d..f8b4e8673 100644
Binary files a/metrics/integration/render-tests/combinations/heatmap-translucent--fill-opaque/expected.png and b/metrics/integration/render-tests/combinations/heatmap-translucent--fill-opaque/expected.png differ
diff --git a/metrics/integration/render-tests/heatmap-color/default/expected.png b/metrics/integration/render-tests/heatmap-color/default/expected.png
index deb0f101d..9879ae007 100644
Binary files a/metrics/integration/render-tests/heatmap-color/default/expected.png and b/metrics/integration/render-tests/heatmap-color/default/expected.png differ
diff --git a/metrics/integration/render-tests/heatmap-color/expression/expected.png b/metrics/integration/render-tests/heatmap-color/expression/expected.png
index deb0f101d..9879ae007 100644
Binary files a/metrics/integration/render-tests/heatmap-color/expression/expected.png and b/metrics/integration/render-tests/heatmap-color/expression/expected.png differ
diff --git a/metrics/integration/render-tests/heatmap-intensity/default/expected.png b/metrics/integration/render-tests/heatmap-intensity/default/expected.png
index 563ee0e8a..65e112417 100644
Binary files a/metrics/integration/render-tests/heatmap-intensity/default/expected.png and b/metrics/integration/render-tests/heatmap-intensity/default/expected.png differ
diff --git a/metrics/integration/render-tests/heatmap-opacity/default/expected.png b/metrics/integration/render-tests/heatmap-opacity/default/expected.png
index 7f0ba0a9a..bc18ae590 100644
Binary files a/metrics/integration/render-tests/heatmap-opacity/default/expected.png and b/metrics/integration/render-tests/heatmap-opacity/default/expected.png differ
diff --git a/metrics/integration/render-tests/heatmap-radius/data-expression/expected.png b/metrics/integration/render-tests/heatmap-radius/data-expression/expected.png
index 40a057f59..edeb03430 100644
Binary files a/metrics/integration/render-tests/heatmap-radius/data-expression/expected.png and b/metrics/integration/render-tests/heatmap-radius/data-expression/expected.png differ
diff --git a/metrics/integration/render-tests/heatmap-radius/default/expected.png b/metrics/integration/render-tests/heatmap-radius/default/expected.png
index 563ee0e8a..65e112417 100644
Binary files a/metrics/integration/render-tests/heatmap-radius/default/expected.png and b/metrics/integration/render-tests/heatmap-radius/default/expected.png differ
diff --git a/metrics/integration/render-tests/heatmap-radius/function/expected.png b/metrics/integration/render-tests/heatmap-radius/function/expected.png
index f05a3f383..b519917a4 100644
Binary files a/metrics/integration/render-tests/heatmap-radius/function/expected.png and b/metrics/integration/render-tests/heatmap-radius/function/expected.png differ
diff --git a/metrics/integration/render-tests/heatmap-radius/literal/expected.png b/metrics/integration/render-tests/heatmap-radius/literal/expected.png
index 697980ed0..99b983a86 100644
Binary files a/metrics/integration/render-tests/heatmap-radius/literal/expected.png and b/metrics/integration/render-tests/heatmap-radius/literal/expected.png differ
diff --git a/metrics/integration/render-tests/heatmap-radius/pitch30/expected.png b/metrics/integration/render-tests/heatmap-radius/pitch30/expected.png
index 756e9836e..56b5994d1 100644
Binary files a/metrics/integration/render-tests/heatmap-radius/pitch30/expected.png and b/metrics/integration/render-tests/heatmap-radius/pitch30/expected.png differ
diff --git a/metrics/integration/render-tests/heatmap-weight/default/expected.png b/metrics/integration/render-tests/heatmap-weight/default/expected.png
index 563ee0e8a..65e112417 100644
Binary files a/metrics/integration/render-tests/heatmap-weight/default/expected.png and b/metrics/integration/render-tests/heatmap-weight/default/expected.png differ
diff --git a/metrics/integration/render-tests/regressions/mapbox-gl-js#2534/expected.png b/metrics/integration/render-tests/regressions/mapbox-gl-js#2534/expected.png
index d46c3a6fc..e2b519b67 100644
Binary files a/metrics/integration/render-tests/regressions/mapbox-gl-js#2534/expected.png and b/metrics/integration/render-tests/regressions/mapbox-gl-js#2534/expected.png differ