diff --git a/include/upgrader/streams/core.sig b/include/upgrader/streams/core.sig
index fff47877fe2996017555fd667e82af5a7ab1db9d..081d688556ac2572177f83cc5301da6512f45267 100644
--- a/include/upgrader/streams/core.sig
+++ b/include/upgrader/streams/core.sig
@@ -1 +1 @@
-366ff61fbe023fe840a4a65138320d11
+e675900fdac39ec981a8d65fc82907b7
diff --git a/include/upgrader/streams/core/1ee831c8-c7c82835.cleanup.sql b/include/upgrader/streams/core/1ee831c8-c7c82835.cleanup.sql
deleted file mode 100644
index 0355df4757646be61acf5e727ed2761f233c38a1..0000000000000000000000000000000000000000
--- a/include/upgrader/streams/core/1ee831c8-c7c82835.cleanup.sql
+++ /dev/null
@@ -1,17 +0,0 @@
--- drop old permissions from group table
-ALTER TABLE `%TABLE_PREFIX%group`
- DROP `group_enabled`,
- DROP `can_create_tickets`,
- DROP `can_edit_tickets`,
- DROP `can_post_ticket_reply`,
- DROP `can_delete_tickets`,
- DROP `can_close_tickets`,
- DROP `can_assign_tickets`,
- DROP `can_transfer_tickets`,
- DROP `can_ban_emails`,
- DROP `can_manage_premade`,
- DROP `can_manage_faq`,
- DROP `can_view_staff_stats`;
-
--- drop useless updated column
-ALTER TABLE `%TABLE_PREFIX%team_member` DROP `updated`;
diff --git a/include/upgrader/streams/core/1ee831c8-c7c82835.patch.sql b/include/upgrader/streams/core/1ee831c8-c7c82835.patch.sql
deleted file mode 100644
index 4c886287491690966973a793386ffc19262b6e74..0000000000000000000000000000000000000000
--- a/include/upgrader/streams/core/1ee831c8-c7c82835.patch.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * @signature c7c828356c88b462ba2e3e1437dca0df
- * @version v1.9.6
- * @title Add role-based access
- *
- * This patch adds support for role based access to group and departments
- *
- */
-
-CREATE TABLE `%TABLE_PREFIX%role` (
- `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
- `flags` int(10) unsigned NOT NULL DEFAULT '1',
- `name` varchar(64) DEFAULT NULL,
- `notes` text,
- `created` datetime NOT NULL,
- `updated` datetime NOT NULL,
- PRIMARY KEY (`id`),
- UNIQUE KEY `name` (`name`)
-) DEFAULT CHARSET=utf8;
-
-ALTER TABLE `%TABLE_PREFIX%group_dept_access`
- ADD `role_id` INT UNSIGNED NOT NULL DEFAULT '0';
-
-ALTER TABLE `%TABLE_PREFIX%groups`
- ADD `role_id` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `group_id` ,
- ADD `flags` INT UNSIGNED NOT NULL DEFAULT '1' AFTER `role_id`,
- CHANGE `group_name` `name` VARCHAR(120) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '',
- CHANGE `group_id` `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
- ADD INDEX (`role_id`);
-
-RENAME TABLE `%TABLE_PREFIX%groups` TO `%TABLE_PREFIX%group`;
-
--- department changes
-ALTER TABLE `%TABLE_PREFIX%department`
- CHANGE `dept_id` `id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT,
- CHANGE `dept_signature` `signature` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
- CHANGE `dept_name` `name` VARCHAR( 128 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
-
--- Finished with patch
-UPDATE `%TABLE_PREFIX%config`
- SET `schema_signature`='c7c828356c88b462ba2e3e1437dca0df';
diff --git a/include/upgrader/streams/core/1ee831c8-c7c82835.task.php b/include/upgrader/streams/core/1ee831c8-c7c82835.task.php
deleted file mode 100644
index 09bf7a6def9a4abc5f762c59d0b0fe8a16e2a3f4..0000000000000000000000000000000000000000
--- a/include/upgrader/streams/core/1ee831c8-c7c82835.task.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-class GroupRoles extends MigrationTask {
-
- var $pmap = array(
- 'can_create_tickets' => 'ticket.create',
- 'can_edit_tickets' => 'ticket.edit',
- 'can_post_ticket_reply' => 'ticket.reply',
- 'can_delete_tickets' => 'ticket.delete',
- 'can_close_tickets' => 'ticket.close',
- 'can_assign_tickets' => 'ticket.assign',
- 'can_transfer_tickets' => 'ticket.transfer',
- 'can_ban_emails' => 'emails.banlist',
- 'can_manage_premade' => 'kb.premade',
- 'can_manage_faq' => 'kb.faq',
- 'can_view_staff_stats' => 'stats.agents');
-
- function run($max_time) {
- global $cfg;
- // Select existing groups and create roles matching the current
- // settings
- foreach (Group::objects() as $group) {
- $ht=array(
- 'flags=1',
- 'name' => sprintf('%s %s', $group->getName(),
- __('Role')),
- 'notes' => $group->getName()
- );
- $perms = array();
- foreach (self::$pmap as $k => $v) {
- if ($group->{$k})
- $perms[] = $v;
- }
-
- $ht['permissions'] = $perms;
-
- $role = Role::__create($ht);
- $group->role_id = $role->getId();
- $group->save();
- }
- }
-}
-
-return 'GroupRoles';
diff --git a/include/upgrader/streams/core/c7c82835-366ff61f.cleanup.sql b/include/upgrader/streams/core/36f6b328-e675900f.cleanup.sql
similarity index 100%
rename from include/upgrader/streams/core/c7c82835-366ff61f.cleanup.sql
rename to include/upgrader/streams/core/36f6b328-e675900f.cleanup.sql
diff --git a/include/upgrader/streams/core/c7c82835-366ff61f.patch.sql b/include/upgrader/streams/core/36f6b328-e675900f.patch.sql
similarity index 96%
rename from include/upgrader/streams/core/c7c82835-366ff61f.patch.sql
rename to include/upgrader/streams/core/36f6b328-e675900f.patch.sql
index df0890e1504f13da161cacb6e5e03d564cb40882..651b4cd407e8bc7941e6e00be2567bb769befcd7 100644
--- a/include/upgrader/streams/core/c7c82835-366ff61f.patch.sql
+++ b/include/upgrader/streams/core/36f6b328-e675900f.patch.sql
@@ -1,7 +1,7 @@
/**
* @version v1.9.6
- * @signature 366ff61fbe023fe840a4a65138320d11
- * @title Add tasks
+ * @signature e675900fdac39ec981a8d65fc82907b7
+ * @title Add support for ticket tasks
*
* This patch adds ability to thread anything and introduces tasks
*
@@ -112,5 +112,5 @@ UPDATE `%TABLE_PREFIX%config`
-- Set new schema signature
UPDATE `%TABLE_PREFIX%config`
- SET `value` = '366ff61fbe023fe840a4a65138320d11'
+ SET `value` = 'e675900fdac39ec981a8d65fc82907b7'
WHERE `key` = 'schema_signature' AND `namespace` = 'core';
diff --git a/include/upgrader/streams/core/c7c82835-366ff61f.task.php b/include/upgrader/streams/core/36f6b328-e675900f.task.php
similarity index 100%
rename from include/upgrader/streams/core/c7c82835-366ff61f.task.php
rename to include/upgrader/streams/core/36f6b328-e675900f.task.php