Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -ra7693f04e693294338aa9829d14f4ed7aa99a7a5 -r5a4a26f106ba03759e3a89b19690fa678f8a3aca
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision a7693f04e693294338aa9829d14f4ed7aa99a7a5)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 5a4a26f106ba03759e3a89b19690fa678f8a3aca)
@@ -54,6 +54,7 @@
         DeviceConfiguration ,
         DeviceRegistration  ,
         SWUpdate            ,
+        RootSSHAccess       ,
         FactoryReset        ,
         Decommission
     }
@@ -72,6 +73,7 @@
         qsTr("Device Configuration"         ), // Device Configuration
         qsTr("Device Registration"          ), // DeviceRegistration
         qsTr("Software Update"              ), // SWUpdate
+        qsTr("Enable Root SSH"              ), // RootSSHAccess
         qsTr("Factory Reset"                ), // FactoryReset
         qsTr("Decommission"                 ), // Decommission
     ]
@@ -90,6 +92,7 @@
         _GuiView.manufactMode                   , // Device Configuration
         true                                    , // DeviceRegistration
         false                                   , // SWUpdate
+        serviceMode                             , // RootSSHAccess
         serviceMode                             , // FactoryReset
         serviceMode                             , // Decommission
     ]
@@ -106,8 +109,9 @@
         false /* serviceMode phase 1 */         , // Language
         false /* serviceMode phase 1 */         , // Calibration
         _GuiView.manufactMode && serviceMode    , // Device Configuration  // && serviceMode added to make sure the service mode is confirmed by HD
-        _GuiView.manufactMode && serviceMode    , // DeviceRegistration    // && serviceMode added to make sure the service mode is confirmed by HD
+        /*_GuiView.manufactMode &&*/ serviceMode    , // DeviceRegistration    // && serviceMode added to make sure the service mode is confirmed by HD // *** manyfactMode removed for testing
         false /* serviceMode phase 1 */         , // SWUpdate
+        serviceMode                             , // RootSSHAccess
         serviceMode                             , // FactoryReset
         serviceMode                             , // Decommission
     ]
@@ -173,6 +177,11 @@
                 push( _settingsDeviceConfiguration )
                 break
 
+            case SettingsStack.RootSSHAccess:
+                vDevice.doInitRootSSHAccess()
+                push( _SettingsRootSSHAccess)
+                break
+
             case SettingsStack.FactoryReset:
                 push( _serviceFactoryReset )
                 break
@@ -198,6 +207,7 @@
     SettingsROInput             { id: _settingsRoInput              }
     SettingsManufacturingSetup  { id: _settingsDeviceConfiguration  }
     SettingsDeviceRegistration  { id: _settingsDeviceRegistration   }
+    SettingsRootSSHAccess       { id: _SettingsRootSSHAccess        }
     SettingsServicePassword     { id: _servicePassword              }
     SettingsFactoryReset        { id: _serviceFactoryReset          }
     SettingsDecommission        { id: _serviceDecommission          }