diff --git a/include/upgrader/streams/core.sig b/include/upgrader/streams/core.sig
index 12c25dcccc83eb603a0367e9d41b434cfadd5617..9493bef9b1c4c8ff7106c08c485ade25df021afe 100644
--- a/include/upgrader/streams/core.sig
+++ b/include/upgrader/streams/core.sig
@@ -1 +1 @@
-740428f9986da6ad85f88ec841b57bfe
+8aeda901a16e08c3229f1ac6da568e02
diff --git a/include/upgrader/streams/core/15b30765-dd0022fb.patch.sql b/include/upgrader/streams/core/15b30765-dd0022fb.patch.sql
index 0006139d679fdf9af8924b639b488e3edc0f2c34..796fbf296b6c5b7e60995c655d0c73262d6036a1 100644
--- a/include/upgrader/streams/core/15b30765-dd0022fb.patch.sql
+++ b/include/upgrader/streams/core/15b30765-dd0022fb.patch.sql
@@ -3,7 +3,7 @@
  * @signature dd0022fb14892c0bb6a9700392df2de7
  *
  * Migrate file attachment data from %file to %file_chunk
- *  
+ *
  */
 
 DROP TABLE IF EXISTS `%TABLE_PREFIX%file_chunk`;
@@ -12,7 +12,7 @@ CREATE TABLE `%TABLE_PREFIX%file_chunk` (
     `chunk_id` int(11) NOT NULL,
     `filedata` longblob NOT NULL,
     PRIMARY KEY (`file_id`, `chunk_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 INSERT INTO `%TABLE_PREFIX%file_chunk` (`file_id`, `chunk_id`, `filedata`)
     SELECT `id`, 0, `filedata`
diff --git a/include/upgrader/streams/core/32de1766-852ca89e.patch.sql b/include/upgrader/streams/core/32de1766-852ca89e.patch.sql
index ba1768fa33fa041703b22cd3257be91eb886fc45..79b9a1e6c7563958dab12e271e466267ae817b00 100644
--- a/include/upgrader/streams/core/32de1766-852ca89e.patch.sql
+++ b/include/upgrader/streams/core/32de1766-852ca89e.patch.sql
@@ -16,7 +16,7 @@ CREATE TABLE `%TABLE_PREFIX%_config` (
   `updated` timestamp NOT NULL default CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY (`namespace`, `key`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 INSERT INTO `%TABLE_PREFIX%_config` (`key`, `value`, `namespace`) VALUES
   ('isonline', (SELECT `isonline` FROM `%TABLE_PREFIX%config` WHERE `id` = 1), 'core')
diff --git a/include/upgrader/streams/core/435c62c3-2e7531a2.patch.sql b/include/upgrader/streams/core/435c62c3-2e7531a2.patch.sql
index 760a6b0c3679bad02e6dd5f7d4c09089a2ddd38e..fd75833c30ca760b971aad04f7c0ef47bf936426 100644
--- a/include/upgrader/streams/core/435c62c3-2e7531a2.patch.sql
+++ b/include/upgrader/streams/core/435c62c3-2e7531a2.patch.sql
@@ -10,19 +10,19 @@ CREATE TABLE `%TABLE_PREFIX%group_dept_access` (
   `dept_id` int(10) unsigned NOT NULL default '0',
   UNIQUE KEY `group_dept`  (`group_id`,`dept_id`),
   KEY `dept_id` (`dept_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 -- Extend membership to groups
 ALTER TABLE `%TABLE_PREFIX%department`
     ADD `group_membership` tinyint( 1 ) unsigned NOT NULL DEFAULT '0' AFTER `ispublic`;
 
 -- Fix teams dates...
-UPDATE `%TABLE_PREFIX%team` 
+UPDATE `%TABLE_PREFIX%team`
     SET `created`=IF(TO_DAYS(`created`), `created`, IF(TO_DAYS(`updated`), `updated`, NOW())),
         `updated`=IF(TO_DAYS(`updated`), `updated`, NOW());
 
--- Fix groups dates... 
-UPDATE `%TABLE_PREFIX%groups` 
+-- Fix groups dates...
+UPDATE `%TABLE_PREFIX%groups`
     SET `created`=IF(TO_DAYS(`created`), `created`, IF(TO_DAYS(`updated`), `updated`, NOW())),
         `updated`=IF(TO_DAYS(`updated`), `updated`, NOW());
 
diff --git a/include/upgrader/streams/core/60fcbee1-f8856d56.patch.sql b/include/upgrader/streams/core/60fcbee1-f8856d56.patch.sql
index 624e88968ef3f673bea2f1a96d4b1733fbff9c8a..3d2a60c5d55fd776c39ab0d4d224d0e87e1d2e91 100644
--- a/include/upgrader/streams/core/60fcbee1-f8856d56.patch.sql
+++ b/include/upgrader/streams/core/60fcbee1-f8856d56.patch.sql
@@ -10,7 +10,7 @@ CREATE TABLE `%TABLE_PREFIX%ticket_event` (
   `timestamp` datetime NOT NULL,
   KEY `ticket_state` (`ticket_id`, `state`, `timestamp`),
   KEY `ticket_stats` (`timestamp`, `state`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 DROP TABLE IF EXISTS `%TABLE_PREFIX%ticket_history`;
 DROP TABLE IF EXISTS `%TABLE_PREFIX%history`;
diff --git a/include/upgrader/streams/core/740428f9-8aeda901.patch.sql b/include/upgrader/streams/core/740428f9-8aeda901.patch.sql
new file mode 100644
index 0000000000000000000000000000000000000000..686ff67dc0e25ea338ddcba7d8ca9c8bcf524fc3
--- /dev/null
+++ b/include/upgrader/streams/core/740428f9-8aeda901.patch.sql
@@ -0,0 +1,13 @@
+/**
+ * @version v1.7.1
+ * @signature 8aeda901a16e08c3229f1ac6da568e02
+ *
+ *  - Transitional patch to fix DB ENGINE
+ *
+ *
+ *
+ */
+
+UPDATE `%TABLE_PREFIX%config`
+    SET `value` = '8aeda901a16e08c3229f1ac6da568e02'
+	WHERE `key` = 'schema_signature' AND `namespace` = 'core';
diff --git a/include/upgrader/streams/core/98ae1ed2-e342f869.patch.sql b/include/upgrader/streams/core/98ae1ed2-e342f869.patch.sql
index 3c2f57454f852eaef23d59dd603543b0df56177f..c1f0978976c0c0248233fee86c595d43061595ff 100644
--- a/include/upgrader/streams/core/98ae1ed2-e342f869.patch.sql
+++ b/include/upgrader/streams/core/98ae1ed2-e342f869.patch.sql
@@ -3,7 +3,7 @@
  * @signature e342f869c7a537ab3ee937fb6e21cdd4
  *
  *  Upgrade from 1.6 RC1-4 to 1.6 RC5
- *  
+ *
  */
 
 ALTER TABLE `%TABLE_PREFIX%config`
@@ -31,7 +31,7 @@ ALTER TABLE `%TABLE_PREFIX%config`
     ADD `hide_staff_name` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0' AFTER `show_answered_tickets`,
     ADD `log_graceperiod` INT UNSIGNED NOT NULL DEFAULT '12' AFTER `log_level`;
 
-ALTER TABLE `%TABLE_PREFIX%email` 
+ALTER TABLE `%TABLE_PREFIX%email`
     ADD `userid` VARCHAR( 125 ) NOT NULL AFTER `name` ,
     ADD `userpass` VARCHAR( 125 ) NOT NULL AFTER `userid`,
     ADD `mail_active` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `userpass` ,
@@ -52,7 +52,7 @@ ALTER TABLE `%TABLE_PREFIX%email`
 
 -- Transfer old POP3 settings to "new" email table
 UPDATE `%TABLE_PREFIX%email` as T1 JOIN `%TABLE_PREFIX%email_pop3` as T2 ON(T1.email_id = T2.`email_id`)
-    SET 
+    SET
      `updated`=NOW(),
      `mail_protocol`='POP',
      `mail_encryption`='NONE',
@@ -103,10 +103,10 @@ ALTER TABLE `%TABLE_PREFIX%ticket`
     ADD `lastresponse` DATETIME NULL AFTER `lastmessage`,
     ADD INDEX ( `duedate` ) ;
 
-ALTER TABLE `%TABLE_PREFIX%ticket` 
+ALTER TABLE `%TABLE_PREFIX%ticket`
     CHANGE `source` `source` ENUM( 'Web', 'Email', 'Phone', 'Other' ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL DEFAULT 'Other' ;
- 
-ALTER TABLE `%TABLE_PREFIX%email_template` 
+
+ALTER TABLE `%TABLE_PREFIX%email_template`
     ADD `note_alert_subj` VARCHAR( 255 ) NOT NULL AFTER `message_alert_body` ,
     ADD `note_alert_body` TEXT NOT NULL AFTER `note_alert_subj`,
     ADD `notes` TEXT NULL AFTER `name`;
@@ -123,7 +123,7 @@ UPDATE `%TABLE_PREFIX%email_template`
                 REPLACE(`ticket_reply_body`, 'view.php', 'ticket.php'),
             '%message', '%response');
 
-ALTER TABLE `%TABLE_PREFIX%ticket_message` 
+ALTER TABLE `%TABLE_PREFIX%ticket_message`
     ADD `messageId` VARCHAR( 255 ) NULL AFTER `ticket_id`,
     ADD INDEX ( `messageId` ) ;
 
@@ -132,7 +132,7 @@ ALTER TABLE `%TABLE_PREFIX%ticket_message` ADD FULLTEXT (`message`);
 ALTER TABLE `%TABLE_PREFIX%ticket_response` ADD FULLTEXT (`response`);
 
 ALTER TABLE `%TABLE_PREFIX%ticket_note` ADD FULLTEXT (`note`);
-  
+
 DROP TABLE IF EXISTS `%TABLE_PREFIX%api_key`;
 CREATE TABLE `%TABLE_PREFIX%api_key` (
   `id` int(10) unsigned NOT NULL auto_increment,
@@ -143,7 +143,7 @@ CREATE TABLE `%TABLE_PREFIX%api_key` (
   `created` datetime NOT NULL default '0000-00-00 00:00:00',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `ipaddr` (`ipaddr`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 DROP TABLE IF EXISTS `%TABLE_PREFIX%syslog`;
 CREATE TABLE `%TABLE_PREFIX%syslog` (
@@ -157,7 +157,7 @@ CREATE TABLE `%TABLE_PREFIX%syslog` (
   `updated` datetime NOT NULL default '0000-00-00 00:00:00',
   PRIMARY KEY  (`log_id`),
   KEY `log_type` (`log_type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 UPDATE `%TABLE_PREFIX%config`
     SET `ostversion`='1.6 RC5';
diff --git a/include/upgrader/streams/core/c00511c7-7be60a84.patch.sql b/include/upgrader/streams/core/c00511c7-7be60a84.patch.sql
index d0948979fa477cc81ccade8f6d2b0b2256b5ef22..1be401052778078f73d9e97cd2007130868b0b17 100644
--- a/include/upgrader/streams/core/c00511c7-7be60a84.patch.sql
+++ b/include/upgrader/streams/core/c00511c7-7be60a84.patch.sql
@@ -16,7 +16,7 @@ CREATE TABLE `%TABLE_PREFIX%file` (
   `created` datetime NOT NULL,
   PRIMARY KEY  (`id`),
   KEY `hash` (`hash`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 -- update ticket attachments ref. table.
 ALTER TABLE `%TABLE_PREFIX%ticket_attachment`
@@ -44,7 +44,7 @@ CREATE TABLE `%TABLE_PREFIX%ticket_event` (
   `timestamp` datetime NOT NULL,
   KEY `ticket_state` (`ticket_id`, `state`, `timestamp`),
   KEY `ticket_stats` (`timestamp`, `state`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 ALTER TABLE `%TABLE_PREFIX%config`
     ADD `passwd_reset_period` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `staff_session_timeout`,
@@ -88,7 +88,7 @@ CREATE TABLE IF NOT EXISTS `%TABLE_PREFIX%sla` (
     `updated` datetime NOT NULL,
     PRIMARY KEY  (`id`),
     UNIQUE KEY `name` (`name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 -- Create a default SLA
 INSERT INTO `%TABLE_PREFIX%sla` (`isactive`, `enable_priority_escalation`,
@@ -109,7 +109,7 @@ CREATE TABLE IF NOT EXISTS `%TABLE_PREFIX%team` (
     UNIQUE KEY `name` (`name`),
     KEY `isnabled` (`isenabled`),
     KEY `lead_id` (`lead_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 -- Create a default TEAM
 INSERT INTO `%TABLE_PREFIX%team` (`lead_id`, `isenabled`, `noalerts`, `name`, `notes`, `created`, `updated`)
@@ -121,7 +121,7 @@ CREATE TABLE IF NOT EXISTS `%TABLE_PREFIX%team_member` (
   `staff_id` int(10) unsigned NOT NULL,
   `updated` datetime NOT NULL,
   PRIMARY KEY  (`team_id`,`staff_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 ALTER TABLE `%TABLE_PREFIX%department`
     ADD sla_id INT UNSIGNED NOT NULL DEFAULT '0' AFTER tpl_id;
@@ -196,7 +196,7 @@ CREATE TABLE `%TABLE_PREFIX%email_filter` (
   `updated` datetime NOT NULL,
   PRIMARY KEY  (`id`),
   KEY `email_id` (`email_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 -- Copy banlist to a new email filter
 INSERT INTO `%TABLE_PREFIX%email_filter` (`execorder`, `isactive`,
@@ -220,7 +220,7 @@ CREATE TABLE `%TABLE_PREFIX%email_filter_rule` (
   PRIMARY KEY  (`id`),
   KEY `filter_id` (`filter_id`),
   UNIQUE `filter` (`filter_id`, `what`, `how`, `val`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 -- SYSTEM BAN LIST was the first filter created, with ID of '1'
 INSERT INTO `%TABLE_PREFIX%email_filter_rule` (`filter_id`, `what`, `how`, `val`)
@@ -239,7 +239,7 @@ CREATE TABLE `%TABLE_PREFIX%session` (
   PRIMARY KEY  (`session_id`),
   KEY `updated` (`session_updated`),
   KEY `user_id` (`user_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- Create tables for FAQ + attachments.
 DROP TABLE IF EXISTS `%TABLE_PREFIX%faq`;
@@ -258,14 +258,14 @@ CREATE TABLE IF NOT EXISTS `%TABLE_PREFIX%faq` (
   KEY `category_id` (`category_id`),
   KEY `ispublished` (`ispublished`),
   FULLTEXT KEY `faq` (`question`,`answer`,`keywords`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 DROP TABLE IF EXISTS `%TABLE_PREFIX%faq_attachment`;
 CREATE TABLE IF NOT EXISTS `%TABLE_PREFIX%faq_attachment` (
   `faq_id` int(10) unsigned NOT NULL,
   `file_id` int(10) unsigned NOT NULL,
   PRIMARY KEY  (`faq_id`,`file_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 -- Add support for attachments to canned responses
 DROP TABLE IF EXISTS `%TABLE_PREFIX%canned_attachment`;
@@ -273,7 +273,7 @@ CREATE TABLE IF NOT EXISTS `%TABLE_PREFIX%canned_attachment` (
   `canned_id` int(10) unsigned NOT NULL,
   `file_id` int(10) unsigned NOT NULL,
   PRIMARY KEY  (`canned_id`,`file_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 -- Rename kb_premade to canned_response
 ALTER TABLE `%TABLE_PREFIX%kb_premade`
@@ -297,14 +297,14 @@ CREATE TABLE IF NOT EXISTS `%TABLE_PREFIX%faq_category` (
   `updated` date NOT NULL,
   PRIMARY KEY  (`category_id`),
   KEY (`ispublic`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 DROP TABLE IF EXISTS `%TABLE_PREFIX%faq_topic`;
 CREATE TABLE IF NOT EXISTS `%TABLE_PREFIX%faq_topic` (
   `faq_id` int(10) unsigned NOT NULL,
   `topic_id` int(10) unsigned NOT NULL,
   PRIMARY KEY  (`faq_id`,`topic_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 
 UPDATE `%TABLE_PREFIX%config`
diff --git a/include/upgrader/streams/core/f8856d56-abe9c0cb.patch.sql b/include/upgrader/streams/core/f8856d56-abe9c0cb.patch.sql
index e78ab80cc525fac35fc81061bc970ef89dc950f0..b6b0f19fa1b20bc12b5b953d9e7fb84fb60430ef 100644
--- a/include/upgrader/streams/core/f8856d56-abe9c0cb.patch.sql
+++ b/include/upgrader/streams/core/f8856d56-abe9c0cb.patch.sql
@@ -1,11 +1,11 @@
 /**
  * Merge ticket thread tables into one
- *  
+ *
  * Replace the ticket_{message,response,note} tables with a single
  * ticket_thread table that will contain data for all three current message
- * types. This simplifies much of the ticket thread code and paves the way 
+ * types. This simplifies much of the ticket thread code and paves the way
  * for other types of messages in the future.
- * 
+ *
  * This patch automagically moves the data from the three federated tables
  * into the one combined table.
  */
@@ -31,7 +31,7 @@ CREATE TABLE `%TABLE_PREFIX%ticket_thread` (
   KEY `old_pk` (`old_pk`),
   KEY `created` (`created`),
   FULLTEXT KEY `body` (`body`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 DROP TABLE IF EXISTS `%TABLE_PREFIX%ticket_email_info`;
 CREATE TABLE `%TABLE_PREFIX%ticket_email_info` (
@@ -39,7 +39,7 @@ CREATE TABLE `%TABLE_PREFIX%ticket_email_info` (
   `email_mid` varchar(255) NOT NULL,
   `headers` text,
   KEY `message_id` (`email_mid`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 -- Transfer messages
 INSERT INTO `%TABLE_PREFIX%ticket_thread`
@@ -54,7 +54,7 @@ INSERT INTO `%TABLE_PREFIX%ticket_thread`
   (`ticket_id`, `staff_id`, `thread_type`, `poster`, `body`, `ip_address`,
     `created`, `updated`, `old_pk`, `old_pid`)
   SELECT `ticket_id`, `staff_id`, 'R', `staff_name`, `response`, `ip_address`,
-    `created`, COALESCE(`updated`, NOW()), `response_id`, `msg_id` 
+    `created`, COALESCE(`updated`, NOW()), `response_id`, `msg_id`
     FROM `%TABLE_PREFIX%ticket_response`;
 
 -- Connect responses to (new) messages
diff --git a/setup/inc/streams/core/install-mysql.sql b/setup/inc/streams/core/install-mysql.sql
index 54006366af4a2e5039777885c7ca66f6dd1dc831..9a5fe11c2235ac2afe72f0b4e24451806ef9518b 100644
--- a/setup/inc/streams/core/install-mysql.sql
+++ b/setup/inc/streams/core/install-mysql.sql
@@ -87,7 +87,7 @@ CREATE TABLE `%TABLE_PREFIX%config` (
   `updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY  (`id`),
   UNIQUE KEY (`namespace`, `key`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 
 INSERT INTO `%TABLE_PREFIX%config` (`namespace`, `key`, `value`) VALUES
   ('core', 'isonline', '0'),