diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
index 129db3406f9..5269a468048 100644
--- a/platform/ios/CHANGELOG.md
+++ b/platform/ios/CHANGELOG.md
@@ -9,6 +9,7 @@ Mapbox welcomes participation and contributions from everyone.  Please read [CON
 * The `text-pitch-alignment` property is now supported in stylesheets for improved street label legibility on a tilted map. ([#5288](https://github.com/mapbox/mapbox-gl-native/pull/5288))
 * The `icon-text-fit` and `icon-text-fit-padding` properties are now supported in stylesheets, allowing the background of a shield to automatically resize to fit the shield’s text. ([#5334](https://github.com/mapbox/mapbox-gl-native/pull/5334))
 * Improved the performance of relocating a non-view-backed point annotation by changing its `coordinate` property. ([#5385](https://github.com/mapbox/mapbox-gl-native/pull/5385))
+* MGLMapDebugOverdrawVisualizationMask does nothing in Release builds of the SDK. This is disabled for performance reasons. ([#5555](https://github.com/mapbox/mapbox-gl-native/pull/5555))
 
 ## 3.3.1
 
diff --git a/platform/ios/src/MGLMapView.h b/platform/ios/src/MGLMapView.h
index cfa6d828fe6..44b05eecf26 100644
--- a/platform/ios/src/MGLMapView.h
+++ b/platform/ios/src/MGLMapView.h
@@ -57,6 +57,7 @@ typedef NS_OPTIONS(NSUInteger, MGLMapDebugMaskOptions) {
     MGLMapDebugCollisionBoxesMask = 1 << 4,
     /** Each drawing operation is replaced by a translucent fill. Overlapping
         drawing operations appear more prominent to help diagnose overdrawing.
+        @note This option does nothing in Release builds of the SDK.
      */
     MGLMapDebugOverdrawVisualizationMask = 1 << 5,
 };
diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md
index f87869c00d1..b2e71999198 100644
--- a/platform/macos/CHANGELOG.md
+++ b/platform/macos/CHANGELOG.md
@@ -15,6 +15,7 @@
 * The `icon-text-fit` and `icon-text-fit-padding` properties are now supported in stylesheets, allowing the background of a shield to automatically resize to fit the shield’s text. ([#5334](https://github.com/mapbox/mapbox-gl-native/pull/5334))
 * Improved the performance of relocating a point annotation by changing its `coordinate` property. ([#5385](https://github.com/mapbox/mapbox-gl-native/pull/5385))
 * Replaced the wireframe debug mask with an overdraw visualization debug mask to match Mapbox GL JS’s overdraw inspector. ([#5403](https://github.com/mapbox/mapbox-gl-native/pull/5403))
+* MGLMapDebugOverdrawVisualizationMask and MGLMapDebugStencilBufferMask does nothing in Release builds of the SDK. These are disabled for performance reasons. ([#5555](https://github.com/mapbox/mapbox-gl-native/pull/5555))
 
 ## 0.2.0
 
diff --git a/platform/macos/src/MGLMapView.h b/platform/macos/src/MGLMapView.h
index c44bfbd63b5..69927bf9708 100644
--- a/platform/macos/src/MGLMapView.h
+++ b/platform/macos/src/MGLMapView.h
@@ -23,10 +23,13 @@ typedef NS_OPTIONS(NSUInteger, MGLMapDebugMaskOptions) {
     
     /** Each drawing operation is replaced by a translucent fill. Overlapping
         drawing operations appear more prominent to help diagnose overdrawing.
+        @note This option does nothing in Release builds of the SDK.
      */
     MGLMapDebugOverdrawVisualizationMask = 1 << 5,
     
-    /** The stencil buffer is shown instead of the color buffer. */
+    /** The stencil buffer is shown instead of the color buffer.
+        @note This option does nothing in Release builds of the SDK.
+     */
     MGLMapDebugStencilBufferMask = 1 << 6,
 };
 
diff --git a/platform/node/CHANGELOG.md b/platform/node/CHANGELOG.md
index 04c169dbb1e..d3fdc33a324 100644
--- a/platform/node/CHANGELOG.md
+++ b/platform/node/CHANGELOG.md
@@ -1,3 +1,7 @@
+# master
+
+* Map debug options 'overdraw' and 'stencil clip' are now disabled (no-ops) in release mode. ([#5555](https://github.com/mapbox/mapbox-gl-native/pull/5555))
+
 # 3.3.0
 
 - Adds runtime styling API ([#5318](https://github.com/mapbox/mapbox-gl-native/pull/5318), [#5380](https://github.com/mapbox/mapbox-gl-native/pull/5380), [#5428](https://github.com/mapbox/mapbox-gl-native/pull/5428), [#5429](https://github.com/mapbox/mapbox-gl-native/pull/5429), [#5462](https://github.com/mapbox/mapbox-gl-native/pull/5462), [#5614](https://github.com/mapbox/mapbox-gl-native/pull/5614), [#5670](https://github.com/mapbox/mapbox-gl-native/pull/5670))