diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp
index 84d8c3291d..6ba476e50b 100644
--- a/ApplicationCode/Application/RiaApplication.cpp
+++ b/ApplicationCode/Application/RiaApplication.cpp
@@ -99,6 +99,7 @@
 #include <QFileDialog>
 #include <QMdiSubWindow>
 #include <QMessageBox>
+#include <QProcessEnvironment>
 #include <QTreeView>
 
 
@@ -1596,6 +1597,15 @@ void RiaApplication::saveWinGeoAndDockToolBarLayout()
 
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RiaApplication::enableDevelopmentFeatures()
+{
+    QString environmentVar = QProcessEnvironment::systemEnvironment().value("RESINSIGHT_DEVEL", QString("0"));
+    return environmentVar.toInt() == 1;
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/Application/RiaApplication.h b/ApplicationCode/Application/RiaApplication.h
index 3db7691e61..e803c788c4 100644
--- a/ApplicationCode/Application/RiaApplication.h
+++ b/ApplicationCode/Application/RiaApplication.h
@@ -106,7 +106,7 @@ public:
 
     RimViewWindow*      activePlotWindow() const;
 
-    RimProject*            project(); 
+    RimProject*         project(); 
 
     void                createMockModel();
     void                createResultsMockModel();
@@ -203,6 +203,8 @@ public:
     void                waitUntilCommandObjectsHasBeenProcessed();
     void                saveWinGeoAndDockToolBarLayout();
 
+    static bool         enableDevelopmentFeatures();
+
 private:
     void                    onProjectOpenedOrClosed();
     void                    setWindowCaptionFromAppState();
diff --git a/ApplicationCode/Application/RiaPreferences.cpp b/ApplicationCode/Application/RiaPreferences.cpp
index 7de821f1a7..30fe04bb27 100644
--- a/ApplicationCode/Application/RiaPreferences.cpp
+++ b/ApplicationCode/Application/RiaPreferences.cpp
@@ -81,14 +81,14 @@ RiaPreferences::RiaPreferences(void)
     useShaders.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
     CAF_PDM_InitField(&showHud,                         "showHud", false, "Show 3D Information", "", "", "");
     showHud.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
-    CAF_PDM_InitField(&appendClassNameToUiText,         "appendClassNameToUiText", false, "Show Class Names", "", "", "");
-    appendClassNameToUiText.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
-    CAF_PDM_InitField(&appendFieldKeywordToToolTipText, "appendFieldKeywordToToolTipText", false, "Show Field Keyword in ToolTip", "", "", "");
-    appendFieldKeywordToToolTipText.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
-    CAF_PDM_InitField(&showTestToolbar, "showTestToolbar", false, "Enable Test Toolbar", "", "", "");
-    showTestToolbar.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
-    CAF_PDM_InitField(&includeFractureDebugInfoFile, "includeFractureDebugInfoFile", false, "Include Fracture Debug Info for Completion Export", "", "", "");
-    includeFractureDebugInfoFile.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
+    CAF_PDM_InitField(&m_appendClassNameToUiText,         "appendClassNameToUiText", false, "Show Class Names", "", "", "");
+    m_appendClassNameToUiText.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
+    CAF_PDM_InitField(&m_appendFieldKeywordToToolTipText, "appendFieldKeywordToToolTipText", false, "Show Field Keyword in ToolTip", "", "", "");
+    m_appendFieldKeywordToToolTipText.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
+    CAF_PDM_InitField(&m_showTestToolbar, "showTestToolbar", false, "Enable Test Toolbar", "", "", "");
+    m_showTestToolbar.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
+    CAF_PDM_InitField(&m_includeFractureDebugInfoFile, "includeFractureDebugInfoFile", false, "Include Fracture Debug Info for Completion Export", "", "", "");
+    m_includeFractureDebugInfoFile.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
 
     CAF_PDM_InitField(&showLegendBackground, "showLegendBackground", true, "Enable Legend Background", "", "", "");
 
@@ -111,7 +111,10 @@ RiaPreferences::RiaPreferences(void)
     m_tabNames << "General";
     m_tabNames << "Eclipse";
     m_tabNames << "Octave";
-    m_tabNames << "System";
+    if (RiaApplication::enableDevelopmentFeatures())
+    {
+        m_tabNames << "System";
+    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -143,10 +146,10 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
             field == &loadAndShowSoil ||
             field == &useShaders ||
             field == &showHud ||
-            field == &appendClassNameToUiText ||
-            field == &appendFieldKeywordToToolTipText ||
-            field == &showTestToolbar ||
-            field == &includeFractureDebugInfoFile ||
+            field == &m_appendClassNameToUiText ||
+            field == &m_appendFieldKeywordToToolTipText ||
+            field == &m_showTestToolbar ||
+            field == &m_includeFractureDebugInfoFile ||
             field == &showLasCurveWithoutTvdWarning)
     {
         caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute);
@@ -210,12 +213,12 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
         scriptGroup->add(&scriptDirectories);
         scriptGroup->add(&scriptEditorExecutable);
     }
-    else if (uiConfigName == m_tabNames[3])
+    else if (RiaApplication::enableDevelopmentFeatures() && uiConfigName == m_tabNames[3])
     {
-        uiOrdering.add(&appendClassNameToUiText);
-        uiOrdering.add(&appendFieldKeywordToToolTipText);
-        uiOrdering.add(&showTestToolbar);
-        uiOrdering.add(&includeFractureDebugInfoFile);
+        uiOrdering.add(&m_appendClassNameToUiText);
+        uiOrdering.add(&m_appendFieldKeywordToToolTipText);
+        uiOrdering.add(&m_showTestToolbar);
+        uiOrdering.add(&m_includeFractureDebugInfoFile);
     }
 
     uiOrdering.skipRemainingFields(true);
@@ -272,3 +275,35 @@ const RifReaderSettings* RiaPreferences::readerSettings() const
     return m_readerSettings;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RiaPreferences::appendClassNameToUiText() const
+{
+    return RiaApplication::enableDevelopmentFeatures() && m_appendClassNameToUiText();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RiaPreferences::appendFieldKeywordToToolTipText() const
+{
+    return RiaApplication::enableDevelopmentFeatures() && m_appendFieldKeywordToToolTipText();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RiaPreferences::showTestToolbar() const
+{
+    return RiaApplication::enableDevelopmentFeatures() && m_showTestToolbar();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RiaPreferences::includeFractureDebugInfoFile() const
+{
+    return RiaApplication::enableDevelopmentFeatures() && m_includeFractureDebugInfoFile();
+}
+
diff --git a/ApplicationCode/Application/RiaPreferences.h b/ApplicationCode/Application/RiaPreferences.h
index 4b2f9c532b..14e468de65 100644
--- a/ApplicationCode/Application/RiaPreferences.h
+++ b/ApplicationCode/Application/RiaPreferences.h
@@ -47,6 +47,12 @@ public:
 
     const RifReaderSettings* readerSettings() const;
 
+    // Debug settings
+    bool appendClassNameToUiText() const;
+    bool appendFieldKeywordToToolTipText() const;
+    bool showTestToolbar() const;
+    bool includeFractureDebugInfoFile() const;
+
 public: // Pdm Fields
     caf::PdmField<caf::AppEnum< RiaApplication::RINavigationPolicy > > navigationPolicy;
 
@@ -69,11 +75,7 @@ public: // Pdm Fields
     caf::PdmField<bool>     showLegendBackground;
 
     caf::PdmField<bool>     useShaders;
-    caf::PdmField<bool>     showHud;
-    caf::PdmField<bool>     appendClassNameToUiText;
-    caf::PdmField<bool>     appendFieldKeywordToToolTipText;
-    caf::PdmField<bool>     showTestToolbar;
-    caf::PdmField<bool>     includeFractureDebugInfoFile;
+    caf::PdmField<bool>     showHud;    
 
     caf::PdmField<QString>  lastUsedProjectFileName;
 
@@ -91,6 +93,9 @@ protected:
 
 private:
     caf::PdmChildField<RifReaderSettings*> m_readerSettings;
-
+    caf::PdmField<bool>                    m_appendClassNameToUiText;
+    caf::PdmField<bool>                    m_appendFieldKeywordToToolTipText;
+    caf::PdmField<bool>                    m_showTestToolbar;
+    caf::PdmField<bool>                    m_includeFractureDebugInfoFile;
     QStringList m_tabNames;
 };