Index: firmware/App/Controllers/BoostPump.c
===================================================================
diff -u -r4626638b758c6673c0a8a3cc8d008bb4a898cea9 -r6c4b1bb9d485e9ab634c7775b707af0614e11788
--- firmware/App/Controllers/BoostPump.c	(.../BoostPump.c)	(revision 4626638b758c6673c0a8a3cc8d008bb4a898cea9)
+++ firmware/App/Controllers/BoostPump.c	(.../BoostPump.c)	(revision 6c4b1bb9d485e9ab634c7775b707af0614e11788)
@@ -7,8 +7,8 @@
 *
 * @file    BoostPump.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      08-Sep-2025
+* @author  (last)      Arpita Srivastava
+* @date    (last)      11-Jun-2026
 *
 * @author  (original)  Michael Garthwaite
 * @date    (original)  08-Sep-2025
@@ -18,7 +18,7 @@
 #include "BoostPump.h"
 #include "Flow.h"
 #include "FPOperationModes.h"
-//#include "NVDataMgmt.h"
+//#include "NVMgmt.h"
 #include "Messaging.h"
 #include "MessageSupport.h"
 #include "PersistentAlarm.h"
Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r4626638b758c6673c0a8a3cc8d008bb4a898cea9 -r6c4b1bb9d485e9ab634c7775b707af0614e11788
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 4626638b758c6673c0a8a3cc8d008bb4a898cea9)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 6c4b1bb9d485e9ab634c7775b707af0614e11788)
@@ -7,8 +7,8 @@
 *
 * @file    ROPump.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      15-Apr-2026
+* @author  (last)      Arpita Srivastava
+* @date    (last)      13-Jul-2026
 *
 * @author  (original)  Michael Garthwaite
 * @date    (original)  08-Sep-2025
@@ -18,7 +18,7 @@
 
 #include "Flow.h"
 #include "FPOperationModes.h"
-//#include "NVDataMgmt.h"
+//#include "NVMgmt.h"
 #include "Messaging.h"
 #include "MessageSupport.h"
 #include "PersistentAlarm.h"
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -ra3ed83ddd9e39aceb6216da6e640c0e369de2902 -r6c4b1bb9d485e9ab634c7775b707af0614e11788
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision a3ed83ddd9e39aceb6216da6e640c0e369de2902)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 6c4b1bb9d485e9ab634c7775b707af0614e11788)
@@ -7,8 +7,8 @@
 *
 * @file    AlarmMgmtSWFaults.h
 *
-* @author  (last)      Jashwant Gantyada
-* @date    (last)      30-Jun-2026
+* @author  (last)      Arpita Srivastava
+* @date    (last)      13-Jul-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  07-Aug-2024
@@ -159,6 +159,14 @@
     SW_FAULT_ID_DIALYSATE_MIX_EXEC_INVALID_STATE = 128,
     SW_FAULT_ID_MODE_UPDATE_INVALID_STATE = 129,
     SW_FAULT_ID_DRY_BICART_DEPRESURIZE_INVALID_EXEC_STATE = 132,
+    SW_FAULT_ID_NVM_INVALID_EXEC_STATE = 133,
+    SW_FAULT_ID_NVM_INVALID_EXEC_SEND_STATE = 134,
+    SW_FAULT_ID_NVM_INVALID_SELF_TEST_STATE = 135,
+    SW_FAULT_ID_NVM_INVALID_USAGE_INFO_SELECTED = 136,
+    SW_FAULT_ID_NVM_WRITE_USAGE_INFO_FAILURE = 137,
+    SW_FAULT_ID_NVM_INVALID_RECORD_SELECTED = 138,
+    SW_FAULT_ID_NVM_OPS_TIMEOUT = 139,
+    SW_FAULT_ID_NVM_INVALID_OPS = 140,
     SW_FAULT_ID_PID_CTRL_INVALID_CONTROLLER1 = 130,
     SW_FAULT_ID_PID_CTRL_INVALID_CONTROLLER2 = 131,
     SW_FAULT_ID_PID_CTRL_INVALID_CONTROLLER3 = 132,