Index: sources/device/DeviceGlobals.h
===================================================================
diff -u -rf0ffeb8c9ec7a838f039b904ce253b001561b5db -r49b21798fb65ce44a04ae4e771ef7c3c1c119fa6
--- sources/device/DeviceGlobals.h	(.../DeviceGlobals.h)	(revision f0ffeb8c9ec7a838f039b904ce253b001561b5db)
+++ sources/device/DeviceGlobals.h	(.../DeviceGlobals.h)	(revision 49b21798fb65ce44a04ae4e771ef7c3c1c119fa6)
@@ -176,35 +176,41 @@
     DEVICE_DEV_PARENT           ( BluetoothPairedQuery                                                          )   \
     DEVICE_DEV_PARENT           ( CryptSetup                                                                    )   \
     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 ( 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       ( 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 ( 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( FactoryReset                                                                  )   \
+    DEVICE_APP_BRIDGE_DEFINITION( Decommission                                                                  )   \
 
 /* ---------------------------- GUI                                                                             */
 #define DEVICE_GUI_BRIDGE_DEFINITION_LIST                                                                           \
@@ -213,13 +219,15 @@
     DEVICE_GUI_BRIDGE_DEFINITION( BluetoothPairedQuery                                                          )   \
     DEVICE_GUI_BRIDGE_DEFINITION( CryptSetup                                                                    )   \
     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 ( FactoryReset                                                                  )   \
+    DEVICE_GUI_INIT_CONNECTIONS ( Decommission                                                                  )   \
 
 /* ---------------------------- VIEW                                                                            */
 #define DEVICE_VIEW_INIT_CONNECTIONS_LIST                                                                           \
@@ -228,4 +236,5 @@
     DEVICE_VIEW_INIT_CONNECTIONS( BluetoothPairedQuery                                                          )   \
     DEVICE_VIEW_INIT_CONNECTIONS( CryptSetup                                                                    )   \
     DEVICE_VIEW_INIT_CONNECTIONS( FactoryReset                                                                  )   \
+    DEVICE_VIEW_INIT_CONNECTIONS( Decommission                                                                  )   \