Index: firmware/App/Modes/FPModes/FPOperationModes.c
===================================================================
diff -u -r4360891b921388dcc35e7b0362c3e4e246714e36 -r24f8a28428bf87b7bf4a1e0ebcfba33ee93fe499
--- firmware/App/Modes/FPModes/FPOperationModes.c	(.../FPOperationModes.c)	(revision 4360891b921388dcc35e7b0362c3e4e246714e36)
+++ firmware/App/Modes/FPModes/FPOperationModes.c	(.../FPOperationModes.c)	(revision 24f8a28428bf87b7bf4a1e0ebcfba33ee93fe499)
@@ -430,6 +430,11 @@
     {
         isDeviceDefeatured = TRUE;
     }
+    // TODO remove the else if after NVM implementation. Value is read from NV memory no need to reset
+    else if ( TRUE != getTestConfigStatus( TEST_CONFIG_FP_ENABLE_DEFEATURE ) )
+    {
+        isDeviceDefeatured = FALSE;
+    }
 
     // TODO - pull status from NV mem.
     return isDeviceDefeatured;
@@ -450,6 +455,11 @@
     {
         isBoostInstalled = TRUE;
     }
+    // TODO remove the else if after NVM implementation. Value is read from NV memory no need to reset
+    else if ( TRUE != getTestConfigStatus( TEST_CONFIG_FP_ENABLE_BOOST_PUMP ) )
+    {
+        isBoostInstalled = FALSE;
+    }
 
     // TODO - pull status from NV mem.
     return isBoostInstalled;