Index: sources/device/DeviceGlobals.h
===================================================================
diff -u -r7f61c3b45a50145fe5c245018d481d6266166fa6 -r5a4a26f106ba03759e3a89b19690fa678f8a3aca
--- sources/device/DeviceGlobals.h	(.../DeviceGlobals.h)	(revision 7f61c3b45a50145fe5c245018d481d6266166fa6)
+++ sources/device/DeviceGlobals.h	(.../DeviceGlobals.h)	(revision 5a4a26f106ba03759e3a89b19690fa678f8a3aca)
@@ -170,35 +170,46 @@
     DEVICE_DEV_PARENT           ( BluetoothPairedQuery                                                          )   \
     DEVICE_DEV_PARENT           ( CryptSetup                                                                    )   \
     DEVICE_DEV_PARENT           ( RootSSHAccess                                                                 )   \
+    DEVICE_DEV_PARENT           ( FactoryReset                                                                  )   \
+    DEVICE_DEV_PARENT           ( Decommission                                                                  )   \
 
 #define DEVICE_DEV_INIT_CONNECTIONS_LIST                                                                            \
     DEVICE_DEV_INIT_CONNECTIONS ( Brightness                                                                    )   \
     DEVICE_DEV_INIT_CONNECTIONS ( BluetoothPairedReset                                                          )   \
     DEVICE_DEV_INIT_CONNECTIONS ( BluetoothPairedQuery                                                          )   \
     DEVICE_DEV_INIT_CONNECTIONS ( CryptSetup                                                                    )   \
     DEVICE_DEV_INIT_CONNECTIONS ( RootSSHAccess                                                                 )   \
+    DEVICE_DEV_INIT_CONNECTIONS ( FactoryReset                                                                  )   \
+    DEVICE_DEV_INIT_CONNECTIONS ( Decommission                                                                  )   \
 
 #define DEVICE_DEV_DEFINITION_LIST                                                                                  \
     DEVICE_DEV_DEFINITION       ( Brightness                                                                    )   \
     DEVICE_DEV_DEFINITION       ( BluetoothPairedReset                                                          )   \
     DEVICE_DEV_DEFINITION       ( BluetoothPairedQuery                                                          )   \
     DEVICE_DEV_DEFINITION       ( CryptSetup                                                                    )   \
     DEVICE_DEV_DEFINITION       ( RootSSHAccess                                                                 )   \
+    DEVICE_DEV_DEFINITION       ( FactoryReset                                                                  )   \
+    DEVICE_DEV_DEFINITION       ( Decommission                                                                  )   \
 
+
 /* ---------------------------- APP                                                                             */
 #define DEVICE_APP_INIT_CONNECTIONS_LIST                                                                            \
     DEVICE_APP_INIT_CONNECTIONS ( Brightness                                                                    )   \
     DEVICE_APP_INIT_CONNECTIONS ( BluetoothPairedReset                                                          )   \
     DEVICE_APP_INIT_CONNECTIONS ( BluetoothPairedQuery                                                          )   \
     DEVICE_APP_INIT_CONNECTIONS ( CryptSetup                                                                    )   \
     DEVICE_APP_INIT_CONNECTIONS ( RootSSHAccess                                                                 )   \
+    DEVICE_APP_INIT_CONNECTIONS ( FactoryReset                                                                  )   \
+    DEVICE_APP_INIT_CONNECTIONS ( Decommission                                                                  )   \
 
 #define DEVICE_APP_BRIDGE_DEFINITION_LIST                                                                           \
     DEVICE_APP_BRIDGE_DEFINITION( Brightness                                                                    )   \
     DEVICE_APP_BRIDGE_DEFINITION( BluetoothPairedReset                                                          )   \
     DEVICE_APP_BRIDGE_DEFINITION( BluetoothPairedQuery                                                          )   \
     DEVICE_APP_BRIDGE_DEFINITION( CryptSetup                                                                    )   \
     DEVICE_APP_BRIDGE_DEFINITION( RootSSHAccess                                                                 )   \
+    DEVICE_APP_BRIDGE_DEFINITION( FactoryReset                                                                  )   \
+    DEVICE_APP_BRIDGE_DEFINITION( Decommission                                                                  )   \
 
 /* ---------------------------- GUI                                                                             */
 #define DEVICE_GUI_BRIDGE_DEFINITION_LIST                                                                           \
@@ -207,13 +218,17 @@
     DEVICE_GUI_BRIDGE_DEFINITION( BluetoothPairedQuery                                                          )   \
     DEVICE_GUI_BRIDGE_DEFINITION( CryptSetup                                                                    )   \
     DEVICE_GUI_BRIDGE_DEFINITION( RootSSHAccess                                                                 )   \
+    DEVICE_GUI_BRIDGE_DEFINITION( FactoryReset                                                                  )   \
+    DEVICE_GUI_BRIDGE_DEFINITION( Decommission                                                                  )   \
 
 #define DEVICE_GUI_INIT_CONNECTIONS_LIST                                                                            \
     DEVICE_GUI_INIT_CONNECTIONS ( Brightness                                                                    )   \
     DEVICE_GUI_INIT_CONNECTIONS ( BluetoothPairedReset                                                          )   \
     DEVICE_GUI_INIT_CONNECTIONS ( BluetoothPairedQuery                                                          )   \
     DEVICE_GUI_INIT_CONNECTIONS ( CryptSetup                                                                    )   \
     DEVICE_GUI_INIT_CONNECTIONS ( RootSSHAccess                                                                 )   \
+    DEVICE_GUI_INIT_CONNECTIONS ( FactoryReset                                                                  )   \
+    DEVICE_GUI_INIT_CONNECTIONS ( Decommission                                                                  )   \
 
 /* ---------------------------- VIEW                                                                            */
 #define DEVICE_VIEW_INIT_CONNECTIONS_LIST                                                                           \
@@ -222,4 +237,6 @@
     DEVICE_VIEW_INIT_CONNECTIONS( BluetoothPairedQuery                                                          )   \
     DEVICE_VIEW_INIT_CONNECTIONS( CryptSetup                                                                    )   \
     DEVICE_VIEW_INIT_CONNECTIONS( RootSSHAccess                                                                    )   \
+    DEVICE_VIEW_INIT_CONNECTIONS( FactoryReset                                                                  )   \
+    DEVICE_VIEW_INIT_CONNECTIONS( Decommission                                                                  )   \