diff --git a/module/block/model.php b/module/block/model.php
index ae230ca046..92a54dff0d 100644
--- a/module/block/model.php
+++ b/module/block/model.php
@@ -276,7 +276,7 @@ class blockModel extends model
             ->fetch('top');
 
         if(!$top) $top = 0;
-        return $top;
+        return (int)$top;
     }
 
     /**
@@ -291,12 +291,7 @@ class blockModel extends model
     {
         foreach($layout as $blockID => $block)
         {
-            $this->dao->update(TABLE_BLOCK)
-                ->set('left')->eq($block['left'])
-                ->set('top')->eq($block['top'])
-                ->where('id')->eq($blockID)
-                ->exec();
-
+            $this->dao->update(TABLE_BLOCK)->set('left')->eq($block['left'])->set('top')->eq($block['top'])->where('id')->eq($blockID)->exec();
             if(dao::isError()) return false;
         }
         return true;
diff --git a/module/upgrade/config.php b/module/upgrade/config.php
index e5e19a24fa..da0159f439 100644
--- a/module/upgrade/config.php
+++ b/module/upgrade/config.php
@@ -42,7 +42,8 @@ $config->upgrade->maxVersion['max4_5']        = '18_5';
 $config->upgrade->maxVersion['max4_6']        = '18_6';
 $config->upgrade->maxVersion['max4_7']        = '18_7';
 $config->upgrade->maxVersion['max4_8']        = '18_8';
-$config->upgrade->maxVersion['max4_9']        = '18_9'; // max insert position.
+$config->upgrade->maxVersion['max4_9']        = '18_9';
+$config->upgrade->maxVersion['max4_10']       = '18_10'; // max insert position.
 
 $config->upgrade->bizVersion = array();
 $config->upgrade->bizVersion['biz1_0']        = '9_5_1';
@@ -123,7 +124,8 @@ $config->upgrade->bizVersion['biz8_5']        = '18_5';
 $config->upgrade->bizVersion['biz8_6']        = '18_6';
 $config->upgrade->bizVersion['biz8_7']        = '18_7';
 $config->upgrade->bizVersion['biz8_8']        = '18_8';
-$config->upgrade->bizVersion['biz8_9']        = '18_9'; // biz insert position.
+$config->upgrade->bizVersion['biz8_9']        = '18_9';
+$config->upgrade->bizVersion['biz8_10']       = '18_10'; // biz insert position.
 
 $config->upgrade->proVersion = array();
 $config->upgrade->proVersion['pro1_0']        = '3_1';
@@ -241,7 +243,8 @@ $config->upgrade->ipdVersion['ipd1_0']       = '18_5';
 $config->upgrade->ipdVersion['ipd1_0_1']     = '18_6';
 $config->upgrade->ipdVersion['ipd1_0_2']     = '18_7';
 $config->upgrade->ipdVersion['ipd1_1']       = '18_8';
-$config->upgrade->ipdVersion['ipd1_1_1']     = '18_9'; // ipd insert position.
+$config->upgrade->ipdVersion['ipd1_1_1']     = '18_9';
+$config->upgrade->ipdVersion['ipd1_1_2']     = '18_10'; // ipd insert position.
 
 $config->upgrade->lowerTables = array();
 $config->upgrade->lowerTables[$config->db->prefix . 'caseStep']       = $config->db->prefix . 'casestep';
diff --git a/module/upgrade/config/upgradeflow.php b/module/upgrade/config/upgradeflow.php
index 5ae8f531d4..b3899378bc 100644
--- a/module/upgrade/config/upgradeflow.php
+++ b/module/upgrade/config/upgradeflow.php
@@ -91,6 +91,7 @@ $config->upgrade->execFlow['18_5']        = array('functions' => 'installIPD,upd
 $config->upgrade->execFlow['18_6']        = array('functions' => 'removeProductLineRequired');
 $config->upgrade->execFlow['18_7']        = array('functions' => 'processHistoryDataForMetric,metric-updateMetricDate');
 $config->upgrade->execFlow['18_8']        = array('functions' => 'upgradeTesttaskMembers,deleteGeneralReportBlock,stopOldCron');
+$config->upgrade->execFlow['18_9']        = array('functions' => 'addDefaultTraincoursePriv,renameBIModule,migrateXuanClientSettings');
 
 if(!empty($config->isINT))
 {
@@ -121,7 +122,7 @@ if($config->edition != 'open')
     $config->upgrade->execFlow['17_4']['params']['addFlowFields']  = array('biz7.4');
     $config->upgrade->execFlow['17_6_2']['functions'] = 'processFeedbackModule';
     $config->upgrade->execFlow['18_3']['functions'] .= ',processDataset,processChart,processReport,processDashboard';
-    $config->upgrade->execFlow['18_4_beta1']['functions'] = 'processDeployStepAction,updateBISQL,updatePivotStage';
+    $config->upgrade->execFlow['18_4_beta1']['functions'] = 'processDeployStepAction,updateBISQL,checkPivotSQL';
 }
 
 if(in_array($this->config->edition, array('max', 'ipd'))) $config->upgrade->execFlow['18_7']['functions'] = 'processOldMetrics,processHistoryDataForMetric,metric-updateMetricDate';
diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php
index 1923798593..4a135a2012 100644
--- a/module/upgrade/lang/version.php
+++ b/module/upgrade/lang/version.php
@@ -184,6 +184,7 @@ $lang->upgrade->fromVersions['18_6']        = '18.6';
 $lang->upgrade->fromVersions['18_7']        = '18.7';
 $lang->upgrade->fromVersions['18_8']        = '18.8';
 $lang->upgrade->fromVersions['18_9']        = '18.9';
+$lang->upgrade->fromVersions['18_10']       = '18.10';
 $lang->upgrade->fromVersions['20_0_alpha1'] = '20.0.alpha1'; // pms insert position.
 
 global $config;
@@ -372,7 +373,8 @@ $lang->upgrade->fromVersions['biz8_5']        = 'Biz8.5';
 $lang->upgrade->fromVersions['biz8_6']        = 'Biz8.6';
 $lang->upgrade->fromVersions['biz8_7']        = 'Biz8.7';
 $lang->upgrade->fromVersions['biz8_8']        = 'Biz8.8';
-$lang->upgrade->fromVersions['biz8_9']        = 'Biz8.9'; // biz insert position.
+$lang->upgrade->fromVersions['biz8_9']        = 'Biz8.9';
+$lang->upgrade->fromVersions['biz8_10']       = 'Biz8.10'; // biz insert position.
 
 /* Max. */
 $lang->upgrade->fromVersions['max2_0_beta4']  = 'Max2.0.beta4';
@@ -418,11 +420,13 @@ $lang->upgrade->fromVersions['max4_5']        = 'Max4.5';
 $lang->upgrade->fromVersions['max4_6']        = 'Max4.6';
 $lang->upgrade->fromVersions['max4_7']        = 'Max4.7';
 $lang->upgrade->fromVersions['max4_8']        = 'Max4.8';
-$lang->upgrade->fromVersions['max4_9']        = 'Max4.9'; // max insert position.
+$lang->upgrade->fromVersions['max4_9']        = 'Max4.9';
+$lang->upgrade->fromVersions['max4_10']       = 'Max4.10'; // max insert position.
 
 /* Ipd */
 $lang->upgrade->fromVersions['ipd1_0_beta1'] = 'Ipd1.0.beta1';
 $lang->upgrade->fromVersions['ipd1_0']       = 'Ipd1.0';
 $lang->upgrade->fromVersions['ipd1_0_1']     = 'Ipd1.0.1';
 $lang->upgrade->fromVersions['ipd1_0_2']     = 'Ipd1.0.2';
-$lang->upgrade->fromVersions['ipd1_1']       = 'Ipd1.1'; // ipd insert position.
+$lang->upgrade->fromVersions['ipd1_1']       = 'Ipd1.1';
+$lang->upgrade->fromVersions['ipd1_1_1']     = 'Ipd1.1.1'; // ipd insert position.