Index: firmware/App/TDCommon.h
===================================================================
diff -u -r5e321d43ba3c70d7280b1c1d4da3f729ca572f76 -rd9f36e25f1b5525c349e96adb3cf369f2bf6484e
--- firmware/App/TDCommon.h	(.../TDCommon.h)	(revision 5e321d43ba3c70d7280b1c1d4da3f729ca572f76)
+++ firmware/App/TDCommon.h	(.../TDCommon.h)	(revision d9f36e25f1b5525c349e96adb3cf369f2bf6484e)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2024-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2024-2026 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    TDCommon.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      19-Dec-2025
+* @author  (last)      Raghu Kallala
+* @date    (last)      29-Apr-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -22,10 +22,10 @@
 
 // ********** version **********
 
-#define TD_VERSION_MAJOR        0
-#define TD_VERSION_MINOR        0
-#define TD_VERSION_MICRO        0
-#define TD_VERSION_BUILD  21
+#define TD_VERSION_MAJOR    0
+#define TD_VERSION_MINOR    0
+#define TD_VERSION_MICRO    0
+#define TD_VERSION_BUILD    49
 
 // ********** development build switches **********
 
@@ -37,8 +37,9 @@
 //    #define TEST_DEBUGGER                   1           // Testing with debugger - prevents FPGA comm alarms caused by breakpoints
 //    #define TEST_PROCESS_TASKS_WO_UI        1           // Allow task processing even when UI not connected
 //    #define TEST_UI_ONLY                    1           // Alpha test with TD and UI only - no DD
+//    #define TEST_DISABLE_UI_ALARMS          1           // Disable UI alarms
 //    #define TEST_USE_OFF_AS_STOP_BUTTON     1           // Alpha test re-purposing off button as a stop button
-    #define TEST_NO_PRESSURE_CHECKS         1           // Alpha test with no pressure sensor checks
+//    #define TEST_NO_PRESSURE_CHECKS         1             // Alpha test with no pressure sensor checks
 //    #define TEST_NO_STOP_CONSUME_CHECK      1           // Alpha test with no check for stop button timeout
 //    #define ASN_DEMO                        1
 
@@ -120,6 +121,8 @@
 
 // **** Common Macros ****
 
+#define BICARBONATE_CONVERSION_FACTOR    0.07337F    ///< Bicarbonate conversion factor mS/cm per mmol/L  //TODO move to institutional records and update the usage with get API call
+
 /**@}*/
 
 // **** VectorCAST Definitions ****