diff --git a/OpenRA.Game/Settings.cs b/OpenRA.Game/Settings.cs
index 203a36209f..ee8b3593ef 100644
--- a/OpenRA.Game/Settings.cs
+++ b/OpenRA.Game/Settings.cs
@@ -87,6 +87,8 @@ namespace OpenRA
 
 	public class DebugSettings
 	{
+		public bool DisplayDeveloperSettings = false;
+
 		public bool BotDebug = false;
 		public bool LuaDebug = false;
 		public bool PerfText = false;
diff --git a/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
index e203ec113f..3bef1e2b90 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
@@ -495,6 +495,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			var ssi = panel.Get<CheckboxWidget>("SENDSYSINFO_CHECKBOX");
 			ssi.IsDisabled = () => !gs.FetchNews;
 
+			panel.Get("DEBUG_OPTIONS").IsVisible = () => ds.DisplayDeveloperSettings;
+			panel.Get("DEBUG_HIDDEN_LABEL").IsVisible = () => !ds.DisplayDeveloperSettings;
+
 			return () => { };
 		}
 
diff --git a/mods/cnc/chrome/settings.yaml b/mods/cnc/chrome/settings.yaml
index c89e5e1f06..75b0534e6a 100644
--- a/mods/cnc/chrome/settings.yaml
+++ b/mods/cnc/chrome/settings.yaml
@@ -571,43 +571,64 @@ Container@SETTINGS_PANEL:
 							Y: 200
 							Width: PARENT_RIGHT
 							Font: Bold
-							Text: Debug
+							Text: Developer
 							Align: Center
-						Checkbox@BOTDEBUG_CHECKBOX:
-							X: 15
-							Y: 220
-							Width: 300
-							Height: 20
-							Font: Regular
-							Text: Show Bot Debug Messages
-						Checkbox@CHECKUNSYNCED_CHECKBOX:
-							X: 15
+						Container@DEBUG_HIDDEN_LABEL:
 							Y: 250
-							Width: 300
-							Height: 20
-							Font: Regular
-							Text: Check Sync around Unsynced Code
-						Checkbox@CHECKBOTSYNC_CHECKBOX:
-							X: 15
-							Y: 280
-							Width: 300
-							Height: 20
-							Font: Regular
-							Text: Check Sync around BotModule Code
-						Checkbox@LUADEBUG_CHECKBOX:
-							X: 310
-							Y: 220
-							Width: 300
-							Height: 20
-							Font: Regular
-							Text: Show Map Debug Messages
-						Checkbox@REPLAY_COMMANDS_CHECKBOX:
-							X: 310
-							Y: 250
-							Width: 300
-							Height: 20
-							Font: Regular
-							Text: Enable Debug Commands in Replays
+							Width: PARENT_RIGHT
+							Children:
+								Label@A:
+									Width: PARENT_RIGHT
+									Height: 20
+									Font: Regular
+									Text: Additional developer-specific options can be enabled via the 
+									Align: Center
+								Label@B:
+									Y: 20
+									Width: PARENT_RIGHT
+									Height: 20
+									Font: Regular
+									Text: Debug.DisplayDeveloperSettings setting or launch flag
+									Align: Center
+						Container@DEBUG_OPTIONS:
+							Width: PARENT_RIGHT
+							Height: PARENT_BOTTOM
+							Children:
+								Checkbox@BOTDEBUG_CHECKBOX:
+									X: 15
+									Y: 220
+									Width: 300
+									Height: 20
+									Font: Regular
+									Text: Show Bot Debug Messages
+								Checkbox@CHECKUNSYNCED_CHECKBOX:
+									X: 15
+									Y: 250
+									Width: 300
+									Height: 20
+									Font: Regular
+									Text: Check Sync around Unsynced Code
+								Checkbox@CHECKBOTSYNC_CHECKBOX:
+									X: 15
+									Y: 280
+									Width: 300
+									Height: 20
+									Font: Regular
+									Text: Check Sync around BotModule Code
+								Checkbox@LUADEBUG_CHECKBOX:
+									X: 310
+									Y: 220
+									Width: 300
+									Height: 20
+									Font: Regular
+									Text: Show Map Debug Messages
+								Checkbox@REPLAY_COMMANDS_CHECKBOX:
+									X: 310
+									Y: 250
+									Width: 300
+									Height: 20
+									Font: Regular
+									Text: Enable Debug Commands in Replays
 		Button@BACK_BUTTON:
 			Key: escape
 			Y: 393
diff --git a/mods/common/chrome/settings.yaml b/mods/common/chrome/settings.yaml
index ec3cf3619b..7d48537882 100644
--- a/mods/common/chrome/settings.yaml
+++ b/mods/common/chrome/settings.yaml
@@ -582,40 +582,61 @@ Background@SETTINGS_PANEL:
 					Y: 200
 					Width: PARENT_RIGHT
 					Font: Bold
-					Text: Debug
+					Text: Developer
 					Align: Center
-				Checkbox@BOTDEBUG_CHECKBOX:
-					X: 15
-					Y: 220
-					Width: 300
-					Height: 20
-					Font: Regular
-					Text: Show Bot Debug Messages
-				Checkbox@CHECKUNSYNCED_CHECKBOX:
-					X: 15
+				Container@DEBUG_HIDDEN_LABEL:
 					Y: 250
-					Width: 300
-					Height: 20
-					Font: Regular
-					Text: Check Sync around Unsynced Code
-				Checkbox@CHECKBOTSYNC_CHECKBOX:
-					X: 15
-					Y: 280
-					Width: 300
-					Height: 20
-					Font: Regular
-					Text: Check Sync around BotModule Code
-				Checkbox@LUADEBUG_CHECKBOX:
-					X: 310
-					Y: 220
-					Width: 300
-					Height: 20
-					Font: Regular
-					Text: Show Map Debug Messages
-				Checkbox@REPLAY_COMMANDS_CHECKBOX:
-					X: 310
-					Y: 250
-					Width: 300
-					Height: 20
-					Font: Regular
-					Text: Enable Debug Commands in Replays
+					Width: PARENT_RIGHT
+					Children:
+						Label@A:
+							Width: PARENT_RIGHT
+							Height: 20
+							Font: Regular
+							Text: Additional developer-specific options can be enabled via the 
+							Align: Center
+						Label@B:
+							Y: 20
+							Width: PARENT_RIGHT
+							Height: 20
+							Font: Regular
+							Text: Debug.DisplayDeveloperSettings setting or launch flag
+							Align: Center
+				Container@DEBUG_OPTIONS:
+					Width: PARENT_RIGHT
+					Height: PARENT_BOTTOM
+					Children:
+						Checkbox@BOTDEBUG_CHECKBOX:
+							X: 15
+							Y: 220
+							Width: 300
+							Height: 20
+							Font: Regular
+							Text: Show Bot Debug Messages
+						Checkbox@CHECKUNSYNCED_CHECKBOX:
+							X: 15
+							Y: 250
+							Width: 300
+							Height: 20
+							Font: Regular
+							Text: Check Sync around Unsynced Code
+						Checkbox@CHECKBOTSYNC_CHECKBOX:
+							X: 15
+							Y: 280
+							Width: 300
+							Height: 20
+							Font: Regular
+							Text: Check Sync around BotModule Code
+						Checkbox@LUADEBUG_CHECKBOX:
+							X: 310
+							Y: 220
+							Width: 300
+							Height: 20
+							Font: Regular
+							Text: Show Map Debug Messages
+						Checkbox@REPLAY_COMMANDS_CHECKBOX:
+							X: 310
+							Y: 250
+							Width: 300
+							Height: 20
+							Font: Regular
+							Text: Enable Debug Commands in Replays