diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index 6863efb0f..7edfc284d 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -2351,7 +2351,7 @@ class wsBase
             }
 
             $oDerivation = new Derivation();
-            if (count($tasks) > 0) {
+            if (!empty($tasks)) {
                 $nextDelegations = $tasks;
             } else {
                 $derive = $oDerivation->prepareInformation($aData);
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
index 56a1ac627..33f4e3a00 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
@@ -852,6 +852,12 @@ class Cases
         }
         Validator::isInteger($del_index, '$del_index');
 
+        global $RBAC;
+        if (!method_exists($RBAC, 'initRBAC')) {
+            $RBAC = \RBAC::getSingleton( PATH_DATA, session_id() );
+            $RBAC->sSystem = 'PROCESSMAKER';
+        }
+
         $case = new \wsBase();
         $case->executeTrigger( $usr_uid, $app_uid, $tri_uid, $del_index );
     }
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
index 0cef982a3..6af9d7e50 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
@@ -358,7 +358,8 @@ class Light
                     case 'REPORT_TO':
                     case 'BALANCED':
                     case 'SELF_SERVICE':
-                        $taskAss['taskUid'] = $aValues['NEXT_TASK']['TAS_UID'];
+                        $taskAss['taskId'] = $aValues['NEXT_TASK']['TAS_UID'];
+                        $taskAss['taskName'] = $aValues['NEXT_TASK']['TAS_TITLE'];
                         $taskAss['taskAssignType'] = $aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'];
                         $taskAss['taskDefProcCode'] = $aValues['NEXT_TASK']['TAS_DEF_PROC_CODE'];
                         $taskAss['delPriority'] = isset($aValues['NEXT_TASK']['DEL_PRIORITY'])?$aValues['NEXT_TASK']['DEL_PRIORITY']:"";
@@ -371,6 +372,7 @@ class Light
                         break;
                     case 'MANUAL':
                         $manual['taskId'] = $aValues['NEXT_TASK']['TAS_UID'];
+                        $manual['taskName'] = $aValues['NEXT_TASK']['TAS_TITLE'];
                         $manual['taskAssignType'] = $aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'];
                         $manual['taskDefProcCode'] = $aValues['NEXT_TASK']['TAS_DEF_PROC_CODE'];
                         $manual['delPriority'] = isset($aValues['NEXT_TASK']['DEL_PRIORITY'])?$aValues['NEXT_TASK']['DEL_PRIORITY']:"";
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessMap.php b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessMap.php
index f3f13a078..068e795ef 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessMap.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessMap.php
@@ -260,56 +260,56 @@ class ProcessMap
     private function load_sprite_coords()
     {
         $xMap = array();
-        $xMap['1_START_EVENT'] = array(0, 4759);
-        $xMap['START_MESSAGECATCH_LEAD'] = array(0, 9371);
-        $xMap['START_TIMER_LEAD'] = array(0, 8872);
-        $xMap['START_CONDITIONAL_LEAD'] = array(0, 9180);
-        $xMap['START_SIGNALCATCH_LEAD'] = array(0, 8905);
-        $xMap['INTERMEDIATE_MESSAGETHROW_THROW'] = array(0, 8987);
+        $xMap['1_START_EVENT'] = array(0, 6623);
+        $xMap['START_MESSAGECATCH_LEAD'] = array(0, 6770);
+        $xMap['START_TIMER_LEAD'] = array(0, 10382);
+        $xMap['START_CONDITIONAL_LEAD'] = array(0, 4737);
+        $xMap['START_SIGNALCATCH_LEAD'] = array(0, 4643);
+        $xMap['INTERMEDIATE_MESSAGETHROW_THROW'] = array(0, 5425);
 //        $xMap['INTERMEDIATE_LINKTHROW_THROW'] = array(0, 4887);
 //        $xMap['INTERMEDIATE_COMPENSATIONTHROW_THROW'] = array(0, 4260);
-        $xMap['INTERMEDIATE_SIGNALTHROW_THROW'] = array(0, 9338);
-        $xMap['INTERMEDIATE_MESSAGECATCH_CATCH'] = array(0, 9213);
-        $xMap['INTERMEDIATE_TIMER_CATCH'] = array(0, 8704);
-        $xMap['INTERMEDIATE_CONDITIONAL_CATCH'] = array(0, 9053);
+        $xMap['INTERMEDIATE_SIGNALTHROW_THROW'] = array(0, 5556);
+        $xMap['INTERMEDIATE_MESSAGECATCH_CATCH'] = array(0, 10509);
+        $xMap['INTERMEDIATE_TIMER_CATCH'] = array(0, 4405);
+        $xMap['INTERMEDIATE_CONDITIONAL_CATCH'] = array(0, 5310);
 //        $xMap['INTERMEDIATE_LINKCATCH_CATCH'] = array(0, 4648);
-        $xMap['INTERMEDIATE_SIGNALCATCH_CATCH'] = array(0, 9246);
+        $xMap['INTERMEDIATE_SIGNALCATCH_CATCH'] = array(0, 5162);
 
-        $xMap['1_END_EVENT'] = array(0, 4832);
-        $xMap['END_MESSAGETHROW'] = array(0, 9486);
-        $xMap['END_ERRORTHROW'] = array(0, 9545);
+        $xMap['1_END_EVENT'] = array(0, 6704);
+        $xMap['END_MESSAGETHROW'] = array(0, 6856);
+        $xMap['END_ERRORTHROW'] = array(0, 6312);
         $xMap['END_CANCELTHROW'] = array(0, 5125);
         $xMap['END_COMPENSATIONTHROW'] = array(0, 5473);
-        $xMap['END_SIGNALTHROW'] = array(0, 9657);
-        $xMap['END_TERMINATETHROW'] = array(0, 9609);
+        $xMap['END_SIGNALTHROW'] = array(0, 6985);
+        $xMap['END_TERMINATETHROW'] = array(0, 6737);
 
-        $xMap['EXCLUSIVE_GATEWAY'] = array(0, 2624);
-        $xMap['PARALLEL_GATEWAY'] = array(0, 3301);
-        $xMap['INCLUSIVE_GATEWAY'] = array(0, 2369);
+        $xMap['EXCLUSIVE_GATEWAY'] = array(0, 3228);
+        $xMap['PARALLEL_GATEWAY'] = array(0, 4438);
+        $xMap['INCLUSIVE_GATEWAY'] = array(0, 2736);
 //        $xMap['EVENTBASED_GATEWAY'] = array(0, 2753);
 //        $xMap['COMPLEX_GATEWAY'] = array(0, 4394);
 
-        $xMap['TASK_SENDTASK'] = array(0, 10468);
-        $xMap['TASK_RECEIVETASK'] = array(0, 10219);
-        $xMap['TASK_USERTASK'] = array(0, 4453);
-        $xMap['TASK_SERVICETASK'] = array(0, 8439);
-        $xMap['TASK_SCRIPTTASK'] = array(0, 8851);
-        $xMap['TASK_MANUALTASK'] = array(0, 9777);
-        $xMap['TASK_BUSINESSRULE'] = array(0, 10561);
-        $xMap['LOOP_LOOP'] = array(0, 5654);
-        $xMap['LOOP_PARALLEL'] = array(0, 7108);
-        $xMap['LOOP_SEQUENTIAL'] = array(0, 7036);
+        $xMap['TASK_SENDTASK'] = array(0, 11059);
+        $xMap['TASK_RECEIVETASK'] = array(0, 10890);
+        $xMap['TASK_USERTASK'] = array(0, 6482);
+        $xMap['TASK_SERVICETASK'] = array(0, 10187);
+        $xMap['TASK_SCRIPTTASK'] = array(0, 10361);
+        $xMap['TASK_MANUALTASK'] = array(0, 10688);
+        $xMap['TASK_BUSINESSRULE'] = array(0, 11136);
+        $xMap['LOOP_LOOP'] = array(0, 8439);
+        $xMap['LOOP_PARALLEL'] = array(0, 9714);
+        $xMap['LOOP_SEQUENTIAL'] = array(0, 9642);
 
-        $xMap['DATAOBJECT'] = array(0, 5401);
-        $xMap['DATAINPUT'] = array(0, 5791);
-        $xMap['DATAOUTPUT'] = array(0, 6071);
-        $xMap['DATASTORE'] = array(0, 3037);
+        $xMap['DATAOBJECT'] = array(0, 8010);
+        $xMap['DATAINPUT'] = array(0, 8544);
+        $xMap['DATAOUTPUT'] = array(0, 8824);
+        $xMap['DATASTORE'] = array(0, 3780);
 
 
-        $xMap['arrow_target_right'] = array(0, 6727);
-        $xMap['arrow_target_left'] = array(0, 6774);
-        $xMap['arrow_target_top'] = array(0, 6819);
-        $xMap['arrow_target_bottom'] = array(0, 6852);
+        $xMap['arrow_target_right'] = array(0, 9333);
+        $xMap['arrow_target_left'] = array(0, 9380);
+        $xMap['arrow_target_top'] = array(0, 9425);
+        $xMap['arrow_target_bottom'] = array(0, 9458);
 
         $xMap['arrow_conditional_source_right'] = array(0, 99);
         $xMap['arrow_conditional_source_left'] = array(0, 99);
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Light.php b/workflow/engine/src/ProcessMaker/Services/Api/Light.php
index d1e50c35e..93bc078e4 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/Light.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Light.php
@@ -121,6 +121,7 @@ class Light extends Api
             'app_number'        => 'caseNumber',
             'app_update_date'   => 'date',
             'del_task_due_date' => 'dueDate',
+            'del_index'         => 'delIndex',
             //'' => 'status'
             'user' => array(
                 'usrcr_usr_uid'       => 'userId',
@@ -194,6 +195,7 @@ class Light extends Api
             'app_number'        => 'caseNumber',
             'app_update_date'   => 'date',
             'del_task_due_date' => 'dueDate',
+            'del_index'         => 'delIndex',
             'currentUser' => array(
                 'usrcr_usr_uid'       => 'userId',
                 'usrcr_usr_firstname' => 'firstName',
@@ -266,6 +268,7 @@ class Light extends Api
             'app_number'        => 'caseNumber',
             'app_update_date'   => 'date',
             'del_task_due_date' => 'dueDate',
+            'del_index'         => 'delIndex',
             'currentUser' => array(
                 'usrcr_usr_uid'       => 'userId',
                 'usrcr_usr_firstname' => 'firstName',
@@ -338,6 +341,7 @@ class Light extends Api
             'app_number'        => 'caseNumber',
             'app_update_date'   => 'date',
             'del_task_due_date' => 'dueDate',
+            'del_index'         => 'delIndex',
             'currentUser' => array(
                 'usrcr_usr_uid'       => 'userId',
                 'usrcr_usr_firstname' => 'firstName',