Index: .gitignore
===================================================================
diff -u -r74107ec7c263e40f4a2925417c8832ff6a065391 -rf8d59f1691d5b6850d2fa59d5312c563a42f0d72
--- .gitignore	(.../.gitignore)	(revision 74107ec7c263e40f4a2925417c8832ff6a065391)
+++ .gitignore	(.../.gitignore)	(revision f8d59f1691d5b6850d2fa59d5312c563a42f0d72)
@@ -4,3 +4,5 @@
 
 
 
+
+.idea/
Index: cloudsync/common/enums.py
===================================================================
diff -u -rae065dc96f33fc1946785ee833356dae959be2d9 -rf8d59f1691d5b6850d2fa59d5312c563a42f0d72
--- cloudsync/common/enums.py	(.../enums.py)	(revision ae065dc96f33fc1946785ee833356dae959be2d9)
+++ cloudsync/common/enums.py	(.../enums.py)	(revision f8d59f1691d5b6850d2fa59d5312c563a42f0d72)
@@ -66,7 +66,7 @@
     UI2CS_REQ_REGISTRATION = 1001
     UI2CS_SEND_DEVICE_INFO = 1002
     UI2CS_SEND_CREDENTIALS_SAVED = 1003
-    UI2CS_SEND_CREDENTIALS = 1004
+    UI2CS_SEND_CHECKIN = 1004
     UI2CS_SEND_FACTORY_RESET_CONFIRMATION = 1005
 
     # OPERATION
@@ -83,7 +83,7 @@
     # REGISTRATION
     CS2UI_REQ_DEVICE_INFO = 2002
     CS2UI_REQ_SAVE_CREDENTIALS = 2003
-    CS2UI_REQ_CREDENTIALS = 2004
+    CS2UI_REQ_CHECKIN = 2004
     CS2UI_REQ_FACTORY_RESET = 2005
 
     # OPERATION
@@ -109,6 +109,7 @@
     CS_REQ_REGISTRATION_ERROR = 901
     CS_SEND_DEVICE_STATE_ERROR = 906
     CS_SEND_TREATMENT_REPORT_ERROR = 907
+    CS_REQ_CHECKIN_ERROR = 908
     CS_REQ_DECOMMISSION_ERROR = 909
     CS_BAD_CRC_ERROR = 910
     CS_DEVICE_VALIDATION_RESULT_ERROR = 920
Index: cloudsync/handlers/ui_cs_request_handler.py
===================================================================
diff -u -rae065dc96f33fc1946785ee833356dae959be2d9 -rf8d59f1691d5b6850d2fa59d5312c563a42f0d72
--- cloudsync/handlers/ui_cs_request_handler.py	(.../ui_cs_request_handler.py)	(revision ae065dc96f33fc1946785ee833356dae959be2d9)
+++ cloudsync/handlers/ui_cs_request_handler.py	(.../ui_cs_request_handler.py)	(revision f8d59f1691d5b6850d2fa59d5312c563a42f0d72)
@@ -217,6 +217,21 @@
                                                          e))
                     self.error_handler.enqueue_error(error=error)
 
+            # CHECK-IN REQUEST
+            elif InboundMessageIDs.mapped_str_value(message.ID) == InboundMessageIDs.UI2CS_SEND_CHECKIN:
+                # send the check-in in either registration or operation
+                self.logger.info("UI2CS_SEND_CHECKIN request received")
+
+                try:
+                    message_body = str(
+                        OutboundMessageIDs.CS2UI_REQ_CHECKIN.value) + ',0'
+                    self.output_channel.enqueue_message(message_body)
+                except Exception as e:
+                    error = Error("{0},2,{1},{2}".format(OutboundMessageIDs.CS2UI_ERROR.value,
+                                                         ErrorIDs.CS_REQ_CHECKIN_ERROR.value,
+                                                         e))
+                    self.error_handler.enqueue_error(error=error)
+
             # ERROR MESSAGE RECEIVED FROM UI
             elif InboundMessageIDs.mapped_str_value(message.ID) == InboundMessageIDs.UI2CS_ERROR:
                 error_body = "{0},{1},{2}".format(InboundMessageIDs.UI2CS_ERROR.value, message.size,