diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/TimerEvent.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/TimerEvent.php
index b439b6c90..62d40a8ce 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/Project/TimerEvent.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/TimerEvent.php
@@ -118,7 +118,9 @@ class TimerEvent extends Api
     public function doPutTimerEvent($prj_uid, $tmrevn_uid, array $request_data)
     {
         try {
-            $arrayData = $this->timerEvent->update($tmrevn_uid, $request_data);
+            \ProcessMaker\BusinessModel\Validator::throwExceptionIfDataNotMetIso8601Format($request_data, $this->arrayFieldIso8601);
+
+            $arrayData = $this->timerEvent->update($tmrevn_uid, \ProcessMaker\Util\DateTime::convertDataToUtc($request_data, $this->arrayFieldIso8601));
         } catch (\Exception $e) {
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
         }
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/System.php b/workflow/engine/src/ProcessMaker/Services/Api/System.php
index 9e49e74ae..b29647e26 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/System.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/System.php
@@ -65,7 +65,8 @@ class System extends Api
         try {
             $enabledFeatures = array();
             /*----------------------------------********---------------------------------*/
-            $keys = array ('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=');
+            $keys = array ('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=',
+                'oq3S29xemxEZXJpZEIzN01qenJUaStSekY4cTdJVm5vbWtVM0d4S2lJSS9qUT0=');
             foreach ($keys as $key) {
                 if (\PMLicensedFeatures
                     ::getSingleton()