Index: sources/bluetooth/BluetoothInterface.cpp
===================================================================
diff -u -r9dd6d10ac1164c651e8d536673641d1e90981207 -r7bb28b34d5337c6fe8669ee797e0312639c0e02f
--- sources/bluetooth/BluetoothInterface.cpp	(.../BluetoothInterface.cpp)	(revision 9dd6d10ac1164c651e8d536673641d1e90981207)
+++ sources/bluetooth/BluetoothInterface.cpp	(.../BluetoothInterface.cpp)	(revision 7bb28b34d5337c6fe8669ee797e0312639c0e02f)
@@ -1,13 +1,13 @@
-/*!
+/*!
  *
  * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
  * \copyright
  * 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    BluetoothInterface.cpp
- * \author  (last)      Behrouz NematiPour
- * \date    (last)      10-Nov-2022
+ * \author  (last)      Vy
+ * \date    (last)      15-May-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  24-Aug-2021
  *
Index: sources/bluetooth/BluetoothInterface.h
===================================================================
diff -u -r45e753bb6f0ffde4ebdb60f6658cbccdd440957f -r7bb28b34d5337c6fe8669ee797e0312639c0e02f
--- sources/bluetooth/BluetoothInterface.h	(.../BluetoothInterface.h)	(revision 45e753bb6f0ffde4ebdb60f6658cbccdd440957f)
+++ sources/bluetooth/BluetoothInterface.h	(.../BluetoothInterface.h)	(revision 7bb28b34d5337c6fe8669ee797e0312639c0e02f)
@@ -6,8 +6,8 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    BluetoothInterface.h
- * \author  (last)      Behrouz NematiPour
- * \date    (last)      28-Mar-2022
+ * \author  (last)      Vy
+ * \date    (last)      11-May-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  24-Aug-2021
  *
Index: sources/gui/qml/compounds/BPHREntry.qml
===================================================================
diff -u -r3146bf4ecddda5c50e80693ba281955af07f8cf9 -r7bb28b34d5337c6fe8669ee797e0312639c0e02f
--- sources/gui/qml/compounds/BPHREntry.qml	(.../BPHREntry.qml)	(revision 3146bf4ecddda5c50e80693ba281955af07f8cf9)
+++ sources/gui/qml/compounds/BPHREntry.qml	(.../BPHREntry.qml)	(revision 7bb28b34d5337c6fe8669ee797e0312639c0e02f)
@@ -7,7 +7,7 @@
  *
  * \file    BPHREntry.qml
  * \author  (last)      Vy
- * \date    (last)      26-Apr-2023
+ * \date    (last)      12-May-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  21-Jun-2021
  *
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -re5750381ee5b27857f6b320981adb0985f0c1b2b -r7bb28b34d5337c6fe8669ee797e0312639c0e02f
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision e5750381ee5b27857f6b320981adb0985f0c1b2b)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 7bb28b34d5337c6fe8669ee797e0312639c0e02f)
@@ -6,8 +6,8 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    TreatmentStack.qml
- * \author  (last)      Behrouz NematiPour
- * \date    (last)      27-Apr-2023
+ * \author  (last)      Vy
+ * \date    (last)      11-May-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  27-Jan-2020
  *
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml
===================================================================
diff -u -re5750381ee5b27857f6b320981adb0985f0c1b2b -r7bb28b34d5337c6fe8669ee797e0312639c0e02f
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml	(.../TreatmentAdjustmentDuration.qml)	(revision e5750381ee5b27857f6b320981adb0985f0c1b2b)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml	(.../TreatmentAdjustmentDuration.qml)	(revision 7bb28b34d5337c6fe8669ee797e0312639c0e02f)
@@ -7,7 +7,7 @@
  *
  * \file    TreatmentAdjustmentDuration.qml
  * \author  (last)      Vy
- * \date    (last)      16-Mar-2023
+ * \date    (last)      11-May-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  27-Apr-2020
  *
Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -r8abfe1622ef6d1b4b00feeebad1bed676393e8dc -r7bb28b34d5337c6fe8669ee797e0312639c0e02f
--- sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 8abfe1622ef6d1b4b00feeebad1bed676393e8dc)
+++ sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 7bb28b34d5337c6fe8669ee797e0312639c0e02f)
@@ -1,23 +1,17 @@
-/*!                                                                                
- *                                                                                 
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.                     
- * \copyright                                                                     
- *          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    MAlarmMapping.cpp                                                     
- * \author  (last)      Behrouz NematiPour                                        
- * \date    (last)      09-May-2023                                                        
- * \author  (original)  Behrouz NematiPour                                        
- * \date    (original)  03-May-2021                                               
- *                                                                                 
- ********************************************************************************* 
- * ANY MODIFICATION IN THIS FILE WILL BE LOST.                                   * 
- * THE CONTENT OF THIS FILE IS AUTOMATICALLY GENERATED ON EACH BUILD ON SERVER.  * 
- * ANY REQUIRED UPDATE NEEDS TO BE DONE IN THE AlarmDefs.h IN common REPOSITORY. * 
- ******************************************************************************* * 
- *                                                                                 
- */                                                                                
+/*!
+ *
+ * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * 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    MAlarmMapping.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      28-Feb-2023
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  04-May-2021
+ *
+ */
 #include "MAlarmStatusData.h"                                                    
                                                                                    
 using namespace Model;                                                             
Index: sources/view/settings/VBluetooth.cpp
===================================================================
diff -u -rb4c2f678d92cea5e5a4d7c6de0afc9181bd8e255 -r7bb28b34d5337c6fe8669ee797e0312639c0e02f
--- sources/view/settings/VBluetooth.cpp	(.../VBluetooth.cpp)	(revision b4c2f678d92cea5e5a4d7c6de0afc9181bd8e255)
+++ sources/view/settings/VBluetooth.cpp	(.../VBluetooth.cpp)	(revision 7bb28b34d5337c6fe8669ee797e0312639c0e02f)
@@ -6,8 +6,8 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    VBluetooth.cpp
- * \author  (last)      Behrouz NematiPour
- * \date    (last)      12-Nov-2021
+ * \author  (last)      Vy
+ * \date    (last)      15-May-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  24-Aug-2021
  *