Index: AlarmMapping.csv
===================================================================
diff -u -r7e503c5459ec77a2816d6c7789da9b206cedbe8a -rfd79fadd4f42518f80e2cf3c19eec5a516ed75d4
--- AlarmMapping.csv	(.../AlarmMapping.csv)	(revision 7e503c5459ec77a2816d6c7789da9b206cedbe8a)
+++ AlarmMapping.csv	(.../AlarmMapping.csv)	(revision fd79fadd4f42518f80e2cf3c19eec5a516ed75d4)
@@ -171,8 +171,8 @@
  170,"HD syringe empty alarm."                                                                                                                     
  171,"HD syringe pump occlusion alarm."                                                                                                            
  172,"HD syringe pump not enough Heparin alarm."                                                                                                   
- 173,"HD arterial air bubble detected alarm."                                                                                                      
- 174,"HD arterial air bubble detected rinseback alarm."                                                                                            
+ 173,"HD RTC configuration error."                                                                                                                 
+ 174,"Alarm ID is available for use."                                                                                                              
  175,"HD pump direction status error."                                                                                                             
  176,"HD active reservoir is full during treatment and DG not ready to switch reservoirs."                                                         
  177,"DG software fault.\nSoftware found itself in an unexpected state."                                                                           
Index: main.cpp
===================================================================
diff -u -r7e503c5459ec77a2816d6c7789da9b206cedbe8a -rfd79fadd4f42518f80e2cf3c19eec5a516ed75d4
--- main.cpp	(.../main.cpp)	(revision 7e503c5459ec77a2816d6c7789da9b206cedbe8a)
+++ main.cpp	(.../main.cpp)	(revision fd79fadd4f42518f80e2cf3c19eec5a516ed75d4)
@@ -275,15 +275,16 @@
     }
 
     if ( ! ver_branch.isEmpty()) ver_branch += '.';
-    QCoreApplication::setApplicationVersion(
-                QString("%1%2%3%4%5.%6")
-                .arg(ver_branch)
-                .arg(ver_major)
-                .arg(ver_minor)
-                .arg(ver_micro)
-                .arg(ver_revis)
-                .arg(ver_comp )
-                );
+    ver_comp = "." + ver_comp;
+    QString version = "";
+    version += ver_branch   ;
+    version += ver_major    ;
+    version += ver_minor    ;
+    version += ver_micro    ;
+    version += ver_revis    ; // build number
+    // TODO: version += ver_comp     ; // removed for the phase 1 version
+
+    QCoreApplication::setApplicationVersion(version);
 }
 
 #ifdef UNIT_TEST
Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r7e503c5459ec77a2816d6c7789da9b206cedbe8a -rfd79fadd4f42518f80e2cf3c19eec5a516ed75d4
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 7e503c5459ec77a2816d6c7789da9b206cedbe8a)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision fd79fadd4f42518f80e2cf3c19eec5a516ed75d4)
@@ -116,7 +116,7 @@
                 0, // title C2
                 1,1,1,1,
             ]
-            itemsValueLeftMargin: 350
+            itemsValueLeftMargin: 300
             itemsValue  : [
                 ""                                      ,
                 Qt.application.version                  ,
Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -r7e503c5459ec77a2816d6c7789da9b206cedbe8a -rfd79fadd4f42518f80e2cf3c19eec5a516ed75d4
--- sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 7e503c5459ec77a2816d6c7789da9b206cedbe8a)
+++ sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision fd79fadd4f42518f80e2cf3c19eec5a516ed75d4)
@@ -7,7 +7,7 @@
  *                                                                                 
  * \file    MAlarmMapping.cpp                                                     
  * \author  (last)      Behrouz NematiPour                                        
- * \date    (last)      23-May-2022                                                        
+ * \date    (last)      24-May-2022                                                        
  * \author  (original)  Behrouz NematiPour                                        
  * \date    (original)  03-May-2021                                               
  *                                                                                 
@@ -206,8 +206,8 @@
 /*0170*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY                  : { result = QObject::tr("HD syringe empty alarm."                                                                                                                     ); break; } /* 170*/
 /*0171*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION                      : { result = QObject::tr("HD syringe pump occlusion alarm."                                                                                                            ); break; } /* 171*/
 /*0172*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM       : { result = QObject::tr("HD syringe pump not enough Heparin alarm."                                                                                                   ); break; } /* 172*/
-/*0173*/case GuiAlarmID::ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED                    : { result = QObject::tr("HD arterial air bubble detected alarm."                                                                                                      ); break; } /* 173*/
-/*0174*/case GuiAlarmID::ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED_RINSEBACK          : { result = QObject::tr("HD arterial air bubble detected rinseback alarm."                                                                                            ); break; } /* 174*/
+/*0173*/case GuiAlarmID::ALARM_ID_HD_RTC_CONFIG_ERROR                            : { result = QObject::tr("HD RTC configuration error."                                                                                                                 ); break; } /* 173*/
+/*0174*/case GuiAlarmID::ALARM_ID____AVAILABLE_2                                 : { result = QObject::tr("Alarm ID is available for use."                                                                                                              ); break; } /* 174*/
 /*0175*/case GuiAlarmID::ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR                 : { result = QObject::tr("HD pump direction status error."                                                                                                             ); break; } /* 175*/
 /*0176*/case GuiAlarmID::ALARM_ID_HD_RESERVOIR_FULL_AND_DG_NOT_READY_TO_SWITCH   : { result = QObject::tr("HD active reservoir is full during treatment and DG not ready to switch reservoirs."                                                         ); break; } /* 176*/
 /*0177*/case GuiAlarmID::ALARM_ID_DG_SOFTWARE_FAULT                              : { result = QObject::tr("DG software fault.\nSoftware found itself in an unexpected state."                                                                           ); break; } /* 177*/