diff --git a/db/update17.4.sql b/db/update17.4.sql
index 9b2e71b002..3c90e379ff 100644
--- a/db/update17.4.sql
+++ b/db/update17.4.sql
@@ -200,3 +200,20 @@ ALTER TABLE `zt_sqlview` ENGINE='InnoDB';
 ALTER TABLE `zt_searchindex` ADD FULLTEXT `title_content` (`title`, `content`);
 ALTER TABLE `zt_searchindex` DROP INDEX `title`;
 ALTER TABLE `zt_searchindex` DROP INDEX `content`;
+
+ALTER TABLE `zt_productplan` ADD `createdBy` varchar(30) NOT NULL AFTER `closedReason`;
+ALTER TABLE `zt_productplan` ADD `createdDate` datetime NOT NULL AFTER `createdBy`;
+
+ALTER TABLE `zt_release` ADD `createdBy` varchar(30) NOT NULL AFTER `subStatus`;
+ALTER TABLE `zt_release` ADD `createdDate` datetime NOT NULL AFTER `createdBy`;
+
+ALTER TABLE `zt_testtask` ADD `createdBy` varchar(30) NOT NULL AFTER `subStatus`;
+ALTER TABLE `zt_testtask` ADD `createdDate` datetime NOT NULL AFTER `createdBy`;
+
+INSERT IGNORE INTO `zt_workflowfield` (`module`, `field`, `type`, `length`, `name`, `control`, `expression`, `options`, `default`, `rules`, `placeholder`, `order`, `searchOrder`, `exportOrder`, `canExport`, `canSearch`, `isValue`, `readonly`, `buildin`, `role`, `desc`, `createdBy`, `createdDate`, `editedBy`, `editedDate`) VALUES
+('testtask',	'createdBy',	'varchar',	'30',	'由谁创建',	'select',	'',	'user',	'',	'',	'',	393,	0,	0,	'0',	'0',	'0',	'1',	1,      'buildin',	'',	'',	'2022-08-02 14:49',	'',	'0000-00-00 00:00:00'),
+('testtask',	'createdDate',	'datetime',	'',	'创建时间',	'datetime',	'',	'',	'',	'',	'',	394,	0,	0,	'0',	'0',	'0',	'1',	1,	'buildin',      '',	'',	'2022-08-02 14:49',	'',	'0000-00-00 00:00:00'),
+('productplan',	'createdBy',	'varchar',	'30',	'由谁创建',	'select',	'',	'user',	'',	'',	'',	11,	0,	0,	'0',	'0',	'0',	'1',	1,	'buildin',      '',	'',	'2022-08-02 14:49',	'',	'0000-00-00 00:00:00'),
+('productplan',	'createdDate',	'datetime',	'',	'创建时间',	'datetime',	'',	'',	'',	'',	'',	12,	0,	0,	'0',	'0',	'0',	'1',	1,	'buildin',      '',	'',	'2022-08-02 14:49',	'',	'0000-00-00 00:00:00'),
+('release',	'createdBy',	'varchar',	'30',	'由谁创建',	'select',	'',	'user',	'',	'',	'',	14,	0,	0,	'0',	'0',	'0',	'1',	1,	'buildin',      '',	'',	'2022-08-02 14:49',	'',	'0000-00-00 00:00:00'),
+('release',	'createdDate',	'datetime',	'',	'创建时间',	'datetime',	'',	'',	'',	'',	'',	15,	0,	0,	'0',	'0',	'0',	'1',	1,	'buildin',      '',	'',	'2022-08-02 14:49',	'',	'0000-00-00 00:00:00');
diff --git a/db/zentao.sql b/db/zentao.sql
index 53175ed5a4..9cbb9bb4e9 100755
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -1091,6 +1091,8 @@ CREATE TABLE IF NOT EXISTS `zt_productplan` (
   `end` date NOT NULL,
   `order` text NOT NULL,
   `closedReason` varchar(20) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
   `deleted` enum('0','1') NOT NULL default '0',
   PRIMARY KEY (`id`),
   KEY `product` (`product`),
@@ -1242,6 +1244,8 @@ CREATE TABLE IF NOT EXISTS `zt_release` (
   `notify` varchar(255),
   `status` varchar(20) NOT NULL default 'normal',
   `subStatus` varchar(30) NOT NULL default '',
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
   `deleted` enum('0','1') NOT NULL default '0',
   PRIMARY KEY (`id`),
   KEY `product` (`product`),
@@ -1671,6 +1675,8 @@ CREATE TABLE IF NOT EXISTS `zt_testtask` (
   `testreport` mediumint(8) unsigned NOT NULL,
   `auto` varchar(10) NOT NULL DEFAULT 'no',
   `subStatus` varchar(30) NOT NULL default '',
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
   `deleted` enum('0','1') NOT NULL default '0',
   PRIMARY KEY (`id`),
   KEY `product` (`product`),
diff --git a/framework/base/router.class.php b/framework/base/router.class.php
index 60ef97b0b1..dd4f15306f 100644
--- a/framework/base/router.class.php
+++ b/framework/base/router.class.php
@@ -996,14 +996,7 @@ class baseRouter
             if($writable)
             {
                 $ztSessionHandler = new ztSessionHandler($_GET['tid']);
-                session_set_save_handler(
-                    array($ztSessionHandler, "open"),
-                    array($ztSessionHandler, "close"),
-                    array($ztSessionHandler, "read"),
-                    array($ztSessionHandler, "write"),
-                    array($ztSessionHandler, "destroy"),
-                    array($ztSessionHandler, "gc")
-                );
+                session_set_save_handler($ztSessionHandler, true);
             }
         }
 
@@ -3107,7 +3100,7 @@ class EndResponseException extends \Exception
  *
  * @package framework
  */
-class ztSessionHandler
+class ztSessionHandler implements SessionHandlerInterface
 {
     public $sessSavePath;
     public $tagID;
diff --git a/framework/model.class.php b/framework/model.class.php
index 3ae6f6d4be..2bd51df082 100644
--- a/framework/model.class.php
+++ b/framework/model.class.php
@@ -157,6 +157,21 @@ class model extends baseModel
         }
         if(empty($relations)) $relations = $this->dao->select('next, actions')->from(TABLE_WORKFLOWRELATION)->where('prev')->eq($moduleName)->fetchPairs();
 
+        $this->loadModel('flow');
+
+        $approvalProgressMenu = '';
+        if($type == 'view' && !empty($this->config->openedApproval) && commonModel::hasPriv('approval', 'progress'))
+        {
+            $flow = $this->loadModel('workflow', 'flow')->getByModule($moduleName);
+            if($flow->approval == 'enabled')
+            {
+                $approvalID = isset($data->approval) ? $data->approval : 0;
+                $extraClass = strpos(',testsuite,build,release,productplan,', ",{$moduleName},") !== false ? 'btn-link' : '';
+                $approvalProgressMenu .= "<div class='divider'></div>";
+                $approvalProgressMenu .= baseHTML::a(helper::createLink('approval', 'progress', "approvalID={$approvalID}", '', true), $this->lang->flow->approvalProgress, "class='btn {$extraClass} iframe'");
+            }
+        }
+
         $menu = '';
         if($show)
         {
@@ -164,8 +179,10 @@ class model extends baseModel
             {
                 if(strpos($action->position, $type) === false || $action->show != $show) continue;
 
-                $menu .= $this->loadModel('flow')->buildActionMenu($moduleName, $action, $data, $type, $relations);
+                $menu .= $this->flow->buildActionMenu($moduleName, $action, $data, $type, $relations);
             }
+
+            if($approvalProgressMenu) $menu .= $approvalProgressMenu;
         }
         else
         {
@@ -174,10 +191,12 @@ class model extends baseModel
             {
                 if(strpos($action->position, $type) === false) continue;
 
-                if($type == 'view' || $action->show == 'direct')         $menu         .= $this->loadModel('flow')->buildActionMenu($moduleName, $action, $data, $type, $relations);
-                if($type == 'browse' && $action->show == 'dropdownlist') $dropdownMenu .= $this->loadModel('flow')->buildActionMenu($moduleName, $action, $data, $type, $relations);
+                if($type == 'view' || $action->show == 'direct')         $menu         .= $this->flow->buildActionMenu($moduleName, $action, $data, $type, $relations);
+                if($type == 'browse' && $action->show == 'dropdownlist') $dropdownMenu .= $this->flow->buildActionMenu($moduleName, $action, $data, $type, $relations);
             }
 
+            if($approvalProgressMenu) $menu .= $approvalProgressMenu;
+
             if($type == 'browse' && $dropdownMenu)
             {
                 $menu .= "<div class='dropdown'><a href='javascript:;' data-toggle='dropdown'>{$this->lang->more}<span class='caret'> </span></a>";
diff --git a/module/bug/model.php b/module/bug/model.php
index 28035ff8fe..f4e4c1f5cd 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -401,6 +401,7 @@ class bugModel extends model
         elseif($browseType == 'bysearch')      $bugs = $this->getBySearch($productIDList, $branch, $queryID, $sort, '', $pager, $projectID);
         elseif($browseType == 'overduebugs')   $bugs = $this->getOverdueBugs($productIDList, $branch, $modules, $executions, $sort, $pager, $projectID);
         elseif($browseType == 'assignedbyme')  $bugs = $this->getByAssignedbyme($productIDList, $branch, $modules, $executions, $sort, $pager, $projectID);
+        elseif($browseType == 'review')        $bugs = $this->getReviewBugs($productIDList, $branch, $modules, $executions, $sort, $pager, $projectID);
 
         return $this->checkDelayedBugs($bugs);
     }
@@ -2902,6 +2903,38 @@ class bugModel extends model
         return $bugs;
     }
 
+    /**
+     * Get bugs to review.
+     *
+     * @param  array       $productIDList
+     * @param  int|string  $branch
+     * @param  array       $modules
+     * @param  array       $executions
+     * @param  string      $orderBy
+     * @param  object      $pager
+     * @param  int         $projectID
+     * @access public
+     * @return array
+     */
+    public function getReviewBugs($productIDList, $branch, $modules, $executions, $orderBy, $pager = null, $projectID = 0)
+    {
+        $bugs = $this->dao->select('t1.*, t2.title as planTitle')->from(TABLE_BUG)->alias('t1')
+            ->leftJoin(TABLE_PRODUCTPLAN)->alias('t2')->on('t1.plan = t2.id')
+            ->where('t1.product')->in($productIDList)
+            ->andWhere('t1.execution')->in(array_keys($executions))
+            ->beginIF($branch !== 'all')->andWhere('t1.branch')->eq($branch)->fi()
+            ->beginIF($modules)->andWhere('t1.module')->in($modules)->fi()
+            ->beginIF($projectID)->andWhere('t1.project')->eq($projectID)->fi()
+            ->andWhere('t1.deleted')->eq(0)
+            ->andWhere("FIND_IN_SET('{$this->app->user->account}', t1.reviewers)")
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.project')->in('0,' . $this->app->user->view->projects)->fi()
+            ->orderBy($orderBy)->page($pager)->fetchAll();
+
+        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug');
+
+        return $bugs;
+    }
+
     /**
      * Get bug query.
      *
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 8774ed36d9..b3e3e81c65 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -37,6 +37,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
   </div>
   <div class="btn-toolbar pull-left">
     <?php
+    common::sortFeatureMenu();
     $menus = customModel::getFeatureMenu($this->moduleName, $this->methodName);
     foreach($menus as $menuItem)
     {
diff --git a/module/build/lang/de.php b/module/build/lang/de.php
index 9ffa1dfda4..d714465ad7 100644
--- a/module/build/lang/de.php
+++ b/module/build/lang/de.php
@@ -68,3 +68,5 @@ $lang->build->action = new stdclass();
 $lang->build->action->buildopened = '$date, erstellt von <strong>$actor</strong>, Build <strong>$extra</strong>.' . "\n";
 
 $lang->backhome = 'zurück';
+
+$lang->build->featureBar['browse']['all'] = 'Build List';
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index 79cd2f6480..73ec7a1d33 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -68,3 +68,5 @@ $lang->build->action = new stdclass();
 $lang->build->action->buildopened = '$date, created by <strong>$actor</strong>, Build <strong>$extra</strong>.' . "\n";
 
 $lang->backhome = 'back';
+
+$lang->build->featureBar['browse']['all'] = 'Build List';
diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php
index cbf8cc4469..48326670ad 100644
--- a/module/build/lang/fr.php
+++ b/module/build/lang/fr.php
@@ -68,3 +68,5 @@ $lang->build->action = new stdclass();
 $lang->build->action->buildopened = '$date, Build <strong>$extra</strong> créé par <strong>$actor</strong>.' . "\n";
 
 $lang->backhome = 'Retour';
+
+$lang->build->featureBar['browse']['all'] = 'Build List';
diff --git a/module/build/lang/vi.php b/module/build/lang/vi.php
index adf75db272..e0080ba5da 100644
--- a/module/build/lang/vi.php
+++ b/module/build/lang/vi.php
@@ -64,3 +64,5 @@ $lang->build->action = new stdclass();
 $lang->build->action->buildopened = '$date, được tạo bởi <strong>$actor</strong>, Bản dựng <strong>$extra</strong>.' . "\n";
 
 $lang->backhome = 'Trở lại';
+
+$lang->build->featureBar['browse']['all'] = 'Build List';
diff --git a/module/build/model.php b/module/build/model.php
index 599601c50a..edb29c9298 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -72,6 +72,7 @@ class buildModel extends model
             ->beginIF($projectID)->andWhere('t1.project')->eq((int)$projectID)->fi()
             ->beginIF($type == 'product' and $param)->andWhere('t1.product')->eq($param)->fi()
             ->beginIF($type == 'bysearch')->andWhere($param)->fi()
+            ->beginIF($type == 'review')->andWhere("FIND_IN_SET('{$this->app->user->account}', t1.reviewers)")->fi()
             ->orderBy($orderBy)
             ->page($pager)
             ->fetchAll('id');
diff --git a/module/caselib/lang/de.php b/module/caselib/lang/de.php
index 652875e151..d36368dae3 100644
--- a/module/caselib/lang/de.php
+++ b/module/caselib/lang/de.php
@@ -44,3 +44,6 @@ $lang->caselib->legendDesc = 'Description';
 
 $lang->caselib->libraryDelete = 'Do you want to delete this library？';
 $lang->caselib->noModule      = '<div>You have no modules.</div><div>Manage it now.</div>';
+
+$lang->caselib->featureBar['browse']['all']  = 'All';
+$lang->caselib->featureBar['browse']['wait'] = 'Waiting';
diff --git a/module/caselib/lang/en.php b/module/caselib/lang/en.php
index 652875e151..d36368dae3 100644
--- a/module/caselib/lang/en.php
+++ b/module/caselib/lang/en.php
@@ -44,3 +44,6 @@ $lang->caselib->legendDesc = 'Description';
 
 $lang->caselib->libraryDelete = 'Do you want to delete this library？';
 $lang->caselib->noModule      = '<div>You have no modules.</div><div>Manage it now.</div>';
+
+$lang->caselib->featureBar['browse']['all']  = 'All';
+$lang->caselib->featureBar['browse']['wait'] = 'Waiting';
diff --git a/module/caselib/lang/fr.php b/module/caselib/lang/fr.php
index 9f02e7f2e9..0b62e64e5f 100644
--- a/module/caselib/lang/fr.php
+++ b/module/caselib/lang/fr.php
@@ -44,3 +44,6 @@ $lang->caselib->legendDesc = 'Description';
 
 $lang->caselib->libraryDelete = 'Voulez vous supprimer cette library ？';
 $lang->caselib->noModule      = "<div>Vous n'avez aucun modules.</div><div>Gérer les modules maintenant.</div>";
+
+$lang->caselib->featureBar['browse']['all']  = 'All';
+$lang->caselib->featureBar['browse']['wait'] = 'Waiting';
diff --git a/module/caselib/lang/vi.php b/module/caselib/lang/vi.php
index 48202a34e2..468d4ff3d9 100644
--- a/module/caselib/lang/vi.php
+++ b/module/caselib/lang/vi.php
@@ -39,3 +39,6 @@ $lang->caselib->legendDesc = 'Mô tả';
 
 $lang->caselib->libraryDelete = 'Bạn có muốn xóa thư viện này?';
 $lang->caselib->noModule      = '<div>Chưa có Module.</div><div>Quản lý ngay.</div>';
+
+$lang->caselib->featureBar['browse']['all']  = 'All';
+$lang->caselib->featureBar['browse']['wait'] = 'Waiting';
diff --git a/module/caselib/lang/zh-cn.php b/module/caselib/lang/zh-cn.php
index e54c946d4e..06c5ee8d67 100644
--- a/module/caselib/lang/zh-cn.php
+++ b/module/caselib/lang/zh-cn.php
@@ -44,3 +44,6 @@ $lang->caselib->legendDesc = '描述';
 
 $lang->caselib->libraryDelete = '您确认要删除该用例库吗？';
 $lang->caselib->noModule      = '<div>您现在还没有模块信息</div><div>请维护用例库模块</div>';
+
+$lang->caselib->featureBar['browse']['all']  = '所有';
+$lang->caselib->featureBar['browse']['wait'] = '待评审';
diff --git a/module/caselib/model.php b/module/caselib/model.php
index 977bc56463..011c9e1c01 100644
--- a/module/caselib/model.php
+++ b/module/caselib/model.php
@@ -220,13 +220,14 @@ class caselibModel extends model
         $browseType   = ($browseType == 'bymodule' and $this->session->libBrowseType and $this->session->libBrowseType != 'bysearch') ? $this->session->libBrowseType : $browseType;
 
         $cases = array();
-        if($browseType == 'bymodule' or $browseType == 'all' or $browseType == 'wait')
+        if($browseType == 'bymodule' or $browseType == 'all' or $browseType == 'wait' or $browseType == 'review')
         {
             $cases = $this->dao->select('*')->from(TABLE_CASE)
                 ->where('lib')->eq((int)$libID)
                 ->andWhere('product')->eq(0)
                 ->beginIF($moduleIdList)->andWhere('module')->in($moduleIdList)->fi()
                 ->beginIF($browseType == 'wait')->andWhere('status')->eq($browseType)->fi()
+                ->beginIF($browseType == 'review')->andWhere("FIND_IN_SET('{$this->app->user->account}', `reviewers`)")->fi()
                 ->andWhere('deleted')->eq('0')
                 ->orderBy($sort)->page($pager)->fetchAll('id');
         }
diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php
index 20a7880ebc..da0d3bd499 100644
--- a/module/caselib/view/browse.html.php
+++ b/module/caselib/view/browse.html.php
@@ -40,10 +40,12 @@ js::set('flow',          $config->global->flow);
   </div>
   <div class='btn-toolbar pull-left'>
     <?php
-    if(common::hasPriv('caselib', 'browse'))
+    common::sortFeatureMenu();
+    if(!$config->testcase->needReview && empty($config->testcase->forceReview)) unset($lang->caselib->featureBar['browse']['wait']);
+    foreach($lang->caselib->featureBar['browse'] as $featureType => $label)
     {
-        echo html::a($this->inlink('browse', "libID=$libID&browseType=all"), "<span class='text'>{$lang->testcase->allCases}</span>", '', "id='allTab' class='btn btn-link'");
-        if($config->testcase->needReview or !empty($config->testcase->forceReview)) echo html::a($this->inlink('browse', "libID=$libID&browseType=wait"), "<span class='text'>" . $lang->testcase->statusList['wait'] . "</span>", '', "id='waitTab' class='btn btn-link'");
+        $activeClass = $browseType == $featureType ? 'btn-active-text' : '';
+        echo html::a(inlink('browse', "libID=$libID&browseType=$featureType"), "<span class='text'>$label</span>", '',"class='btn btn-link $activeClass' data-app={$app->tab} id=" . $featureType .'Tab');
     }
     ?>
     <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->testcase->bySearch;?></a>
diff --git a/module/ci/control.php b/module/ci/control.php
index 1118fef65f..5c5ea8fdc2 100644
--- a/module/ci/control.php
+++ b/module/ci/control.php
@@ -149,16 +149,18 @@ class ci extends control
                 ->fetch();
 
             $testtask = new stdclass();
-            $testtask->product   = $productID;
-            $testtask->name      = !empty($post->name) ? $post->name : sprintf($this->lang->testtask->titleOfAuto, date('Y-m-d H:i:s'));
-            $testtask->owner     = $this->app->user->account;
-            $testtask->project   = $lastProject->project;
-            $testtask->execution = $lastProject->id;
-            $testtask->build     = 'trunk';
-            $testtask->auto      = strtolower($testType);
-            $testtask->begin     = date('Y-m-d');
-            $testtask->end       = date('Y-m-d', time() + 24 * 3600);
-            $testtask->status    = 'done';
+            $testtask->product     = $productID;
+            $testtask->name        = !empty($post->name) ? $post->name : sprintf($this->lang->testtask->titleOfAuto, date('Y-m-d H:i:s'));
+            $testtask->owner       = $this->app->user->account;
+            $testtask->project     = $lastProject->project;
+            $testtask->execution   = $lastProject->id;
+            $testtask->build       = 'trunk';
+            $testtask->auto        = strtolower($testType);
+            $testtask->begin       = date('Y-m-d');
+            $testtask->end         = date('Y-m-d', time() + 24 * 3600);
+            $testtask->status      = 'done';
+            $testtask->createdBy   = $this->app->user->account;
+            $testtask->createdDate = helper::now();
 
             $this->dao->insert(TABLE_TESTTASK)->data($testtask)->exec();
             $taskID = $this->dao->lastInsertId();
diff --git a/module/common/model.php b/module/common/model.php
index 4f68d398e7..b9a4def805 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -3373,6 +3373,45 @@ EOD;
 
         return $Parsedown->text($markdown);
     }
+
+    /**
+     * Sort featureBar.
+     *
+     * @param  string $module
+     * @param  string $method
+     * @static
+     * @access public
+     * @return bool
+     */
+    public static function sortFeatureMenu($module = '', $method = '')
+    {
+        global $lang, $app;
+
+        $module = $module ? $module : $app->rawModule;
+        $method = $method ? $method : $app->rawMethod;
+
+        /* It will be sorted according to the workflow in the future */
+        if(!empty($lang->featureBarSort[$module][$method]))
+        {
+            $featureBar = array();
+            if(empty($lang->$module->featureBar[$method])) return false;
+            foreach($lang->$module->featureBar[$method] as $key => $label)
+            {
+                foreach($lang->featureBarSort[$module][$method] as $currentKey => $afterKey)
+                {
+                    if($key == $currentKey) continue;
+                    $featureBar[$method][$key] = $label;
+                    if($key == $afterKey && !empty($lang->$module->featureBar[$method][$currentKey]))
+                    {
+                        $featureBar[$method][$currentKey] = $lang->$module->featureBar[$method][$currentKey];
+                    }
+                }
+            }
+            $lang->$module->featureBar = $featureBar;
+        }
+
+        return true;
+    }
 }
 
 class common extends commonModel
diff --git a/module/convert/converter/redmine1.1.php b/module/convert/converter/redmine1.1.php
index 6c2962f9b8..63b665daf5 100644
--- a/module/convert/converter/redmine1.1.php
+++ b/module/convert/converter/redmine1.1.php
@@ -385,7 +385,9 @@ class redmine11ConvertModel extends redmineConvertModel
         /* Insert into zentao */
         foreach($productPlans as $id => $productPlan)
         {
-            $productPlan->product = $this->map['products'][$productPlan->execution_id];
+            $productPlan->product     = $this->map['products'][$productPlan->execution_id];
+            $productPlan->createdBy   = $this->app->user->account;
+            $productPlan->createdDate = helper::now();
             unset($productPlan->id);
             unset($productPlan->execution_id);
             $this->dao->dbh($this->dbh)->insert(TABLE_PRODUCTPLAN)->data($productPlan)->exec();
@@ -395,7 +397,9 @@ class redmine11ConvertModel extends redmineConvertModel
         foreach($this->map['products'] as $productID)
         {
             $productPlan = $this->dao->dbh($this->dbh)->select("name as title, createdDate as begin")->from(TABLE_PRODUCT)->where('id')->eq($productID)->fetch();
-            $productPlan->product = $productID;
+            $productPlan->product     = $productID;
+            $productPlan->createdBy   = $this->app->user->account;
+            $productPlan->createdDate = helper::now();
             $this->dao->dbh($this->dbh)->insert(TABLE_PRODUCTPLAN)->data($productPlan)->exec();
             $this->map['planOfProduct'][$productID] = $this->dao->lastinsertID();
         }
diff --git a/module/convert/model.php b/module/convert/model.php
index 8ad71afe3d..152fe6578b 100644
--- a/module/convert/model.php
+++ b/module/convert/model.php
@@ -989,12 +989,14 @@ class convertModel extends model
             if(empty($data->RELEASEDATE)) continue;
 
             $release = new stdclass();
-            $release->product = $build->product;
-            $release->build   = $buildID;
-            $release->name    = $build->name;
-            $release->date    = $build->date;
-            $release->desc    = $data->DESCRIPTION;
-            $release->status  = 'normal';
+            $release->product     = $build->product;
+            $release->build       = $buildID;
+            $release->name        = $build->name;
+            $release->date        = $build->date;
+            $release->desc        = $data->DESCRIPTION;
+            $release->status      = 'normal';
+            $release->createdBy   = $this->app->user->account;
+            $release->createdDate = helper::now();
 
             $this->dao->dbh($this->dbh)->insert(TABLE_RELEASE)->data($release)->exec();
             $releaseID = $this->dao->dbh($this->dbh)->lastInsertID();
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index e2c713bd1e..e3a93dd771 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -513,6 +513,8 @@ $lang->execution->featureBar['all']['doing']     = $lang->execution->statusList[
 $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
 $lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
+$lang->execution->featureBar['build']['all'] = 'Build List';
+
 $lang->execution->myExecutions = 'Ich bin beteiligt.';
 $lang->execution->doingProject = 'Laufende Projekte';
 
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index ee0fd4982f..37254e4b4c 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -513,6 +513,8 @@ $lang->execution->featureBar['all']['doing']     = $lang->execution->statusList[
 $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
 $lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
+$lang->execution->featureBar['build']['all'] = 'Build List';
+
 $lang->execution->myExecutions = 'Mine';
 $lang->execution->doingProject = 'Ongoing Projects';
 
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index 9915245c72..60f4d20c71 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -513,6 +513,8 @@ $lang->execution->featureBar['all']['doing']     = $lang->execution->statusList[
 $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
 $lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
+$lang->execution->featureBar['build']['all'] = 'Build List';
+
 $lang->execution->myExecutions = "J'étais impliqué";
 $lang->execution->doingProject = 'Projets en cours';
 
diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php
index c1f02f6280..242f3d7b1a 100644
--- a/module/execution/lang/vi.php
+++ b/module/execution/lang/vi.php
@@ -418,6 +418,8 @@ $lang->execution->featureBar['all']['doing']     = $lang->execution->statusList[
 $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
 $lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
+$lang->execution->featureBar['build']['all'] = 'Build List';
+
 $lang->execution->myExecutions = 'Tôi tham gia';
 $lang->execution->doingProject = 'Hiện trường';
 
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index ea81fd5260..5025ccf4de 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -513,6 +513,8 @@ $lang->execution->featureBar['all']['doing']     = $lang->execution->statusList[
 $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
 $lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
+$lang->execution->featureBar['build']['all'] = '所有版本';
+
 $lang->execution->myExecutions = '我参与的';
 $lang->execution->doingProject = '进行中的项目';
 
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index 2cca80f2ba..512b25aae3 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -48,6 +48,7 @@ js::set('isCNLang', !$this->loadModel('common')->checkNotCN())
       </ul>
     </div>
     <?php endif;?>
+    <?php common::sortFeatureMenu();?>
     <?php foreach($lang->execution->featureBar['all'] as $key => $label):?>
     <?php $label = "<span class='text'>$label</span>";?>
     <?php if($status == $key) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>
diff --git a/module/execution/view/build.html.php b/module/execution/view/build.html.php
index b8287370df..3f2e90bc4b 100644
--- a/module/execution/view/build.html.php
+++ b/module/execution/view/build.html.php
@@ -16,14 +16,14 @@
 <div id="mainMenu" class="clearfix table-row">
   <div class="btn-toolbar pull-left">
     <?php
-    $label  = "<span class='text'>{$lang->execution->build}</span>";
-    $active = '';
-    if($type == 'all')
+    common::sortFeatureMenu();
+    foreach($lang->execution->featureBar['build'] as $featureType => $label)
     {
-        $active = 'btn-active-text';
-        $label .= " <span class='label label-light label-badge'>{$buildsTotal}</span>";
+        $label       = "<span class='text'>$label</span>";
+        $activeClass = $type == $featureType ? 'btn-active-text' : '';
+        if($type == $featureType) $label .= " <span class='label label-light label-badge'>{$buildsTotal}</span>";
+        echo html::a(inlink('build', "executionID=$executionID&type=$featureType"), $label, '',"class='btn btn-link $activeClass' data-app={$app->tab} id='$featureType'");
     }
-    echo html::a(inlink('build', "executionID={$executionID}&type=all"), $label, '', "class='btn btn-link $active' id='all'")
     ?>
     <div class="input-control space w-150px"><?php echo html::select('product', $products, $product, "onchange='changeProduct(this.value)' class='form-control chosen' data-placeholder='{$lang->productCommon}'");?></div>
   </div>
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 2581a06aca..6b69a30834 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -49,13 +49,12 @@
     </div>
   </div>
   <div class="btn-toolbar pull-left">
-    <?php
-    if(common::hasPriv('execution', 'story'))
-    {
-        echo html::a($this->createLink('execution', 'story', "executionID=$execution->id&orderBy=order_desc&type=all"), "<span class='text'>{$lang->all}</span>" . ($type == 'all' ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : ''), '', "class='btn btn-link" . ($type == 'all' ? " btn-active-text" : '') . "'");
-        echo html::a($this->createLink('execution', 'story', "executionID=$execution->id&orderBy=order_desc&type=unclosed"), "<span class='text'>{$lang->story->unclosed}</span>" . ($type == 'unclosed' ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : ''), '', "class='btn btn-link" . ($type == 'unclosed' ? " btn-active-text" : '') . "'");
-    }
-    ?>
+    <?php foreach($lang->story->featureBar['browse'] as $featureType => $label):?>
+    <?php $active = $type == $featureType ? 'btn-active-text' : '';?>
+    <?php $label  = "<span class='text'>$label</span>";?>
+    <?php if($type == $featureType) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>
+    <?php echo html::a(inlink('story', "executionID=$execution->id&orderBy=order_desc&type=$featureType"), $label, '', "class='btn btn-link $active'");?>
+    <?php endforeach;?>
     <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->product->searchStory;?></a>
   </div>
   <div class="btn-toolbar pull-right">
diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index aaca5d0609..6b722f4ed8 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -59,6 +59,7 @@ body {margin-bottom: 25px;}
   </div>
   <div class="btn-toolbar pull-left">
     <?php
+    common::sortFeatureMenu();
     foreach(customModel::getFeatureMenu('execution', 'task') as $menuItem)
     {
         if($execution->type == 'ops' && $menuItem->name == 'needconfirm') continue;
diff --git a/module/product/model.php b/module/product/model.php
index 1986d788de..bda572234c 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -272,7 +272,7 @@ class productModel extends model
             ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->products)->fi()
             ->andWhere('t1.vision')->eq($this->config->vision)->fi()
             ->beginIF($status == 'noclosed')->andWhere('t1.status')->ne('closed')->fi()
-            ->beginIF($status != 'all' and $status != 'noclosed' and $status != 'involved')->andWhere('t1.status')->in($status)->fi()
+            ->beginIF(!in_array($status, array('all', 'noclosed', 'involved', 'review'), true))->andWhere('t1.status')->in($status)->fi()
             ->beginIF($status == 'involved')
             ->andWhere('t1.PO', true)->eq($this->app->user->account)
             ->orWhere('t1.QD')->eq($this->app->user->account)
@@ -280,6 +280,10 @@ class productModel extends model
             ->orWhere('t1.createdBy')->eq($this->app->user->account)
             ->markRight(1)
             ->fi()
+            ->beginIF($status == 'review')
+            ->andWhere("FIND_IN_SET('{$this->app->user->account}', t1.reviewers)")
+            ->andWhere('t1.reviewStatus')->eq('doing')
+            ->fi()
             ->orderBy('t2.order_asc, t1.line_desc, t1.order_asc')
             ->beginIF($limit > 0)->limit($limit)->fi()
             ->fetchAll('id');
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 0ac5a3c677..9b7c2c1119 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -13,6 +13,7 @@
 <?php include '../../common/view/sortable.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
+    <?php common::sortFeatureMenu();?>
     <?php foreach($lang->product->featureBar['all'] as $key => $label):?>
     <?php $recTotalLabel = $browseType == $key ? " <span class='label label-light label-badge'>{$recTotal}</span>" : '';?>
     <?php echo html::a(inlink("all", "browseType=$key&orderBy=$orderBy"), "<span class='text'>{$label}</span>" . $recTotalLabel, '', "class='btn btn-link' id='{$key}Tab'");?>
diff --git a/module/productplan/model.php b/module/productplan/model.php
index 663e969371..ce11b9c86b 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -105,9 +105,10 @@ class productplanModel extends model
         $plans = $this->dao->select('*')->from(TABLE_PRODUCTPLAN)->where('product')->eq($product)
             ->andWhere('deleted')->eq(0)
             ->beginIF(!empty($branch) and $branch != 'all')->andWhere('branch')->eq($branch)->fi()
-            ->beginIF(strpos(',all,undone,bySearch,', ",$browseType,") === false)->andWhere('status')->eq($browseType)->fi()
+            ->beginIF(strpos(',all,undone,bySearch,review,', ",$browseType,") === false)->andWhere('status')->eq($browseType)->fi()
             ->beginIF($browseType == 'undone')->andWhere('status')->in('wait,doing')->fi()
             ->beginIF($browseType == 'bySearch')->andWhere($productplanQuery)->fi()
+            ->beginIF($browseType == 'review')->andWhere("FIND_IN_SET('{$this->app->user->account}', reviewers)")->fi()
             ->beginIF(strpos($param, 'skipparent') !== false)->andWhere('parent')->ne(-1)->fi()
             ->orderBy($orderBy)
             ->page($pager)
@@ -443,6 +444,8 @@ class productplanModel extends model
         $plan = fixer::input('post')->stripTags($this->config->productplan->editor->create['id'], $this->config->allowedTags)
             ->setIF($this->post->future || empty($_POST['begin']), 'begin', $this->config->productplan->future)
             ->setIF($this->post->future || empty($_POST['end']), 'end', $this->config->productplan->future)
+            ->setDefault('createdBy', $this->app->user->account)
+            ->setDefault('createdDate', helper::now())
             ->remove('delta,uid,future')
             ->get();
 
diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php
index 453243d5bc..a046895e57 100644
--- a/module/productplan/view/browsebylist.html.php
+++ b/module/productplan/view/browsebylist.html.php
@@ -16,6 +16,7 @@
 </style>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
+    <?php common::sortFeatureMenu();?>
     <?php foreach(customModel::getFeatureMenu($this->moduleName, $this->methodName) as $menuItem):?>
     <?php if(isset($menuItem->hidden)) continue;?>
     <?php $label   = "<span class='text'>{$menuItem->text}</span>";?>
diff --git a/module/program/lang/de.php b/module/program/lang/de.php
index 6505b7fb48..9eeaa6ef8c 100644
--- a/module/program/lang/de.php
+++ b/module/program/lang/de.php
@@ -139,12 +139,12 @@ $lang->program->statusList['doing']     = 'Doing';
 $lang->program->statusList['suspended'] = 'Suspended';
 $lang->program->statusList['closed']    = 'Closed';
 
-$lang->program->featureBar['all']       = 'All';
-$lang->program->featureBar['unclosed']  = 'Unclosed';
-$lang->program->featureBar['wait']      = 'Waiting';
-$lang->program->featureBar['doing']     = 'Doing';
-$lang->program->featureBar['suspended'] = 'Suspended';
-$lang->program->featureBar['closed']    = 'Closed';
+$lang->program->featureBar['browse']['all']       = 'All';
+$lang->program->featureBar['browse']['unclosed']  = 'Unclosed';
+$lang->program->featureBar['browse']['wait']      = 'Waiting';
+$lang->program->featureBar['browse']['doing']     = 'Doing';
+$lang->program->featureBar['browse']['suspended'] = 'Suspended';
+$lang->program->featureBar['browse']['closed']    = 'Closed';
 
 $lang->program->kanban = new stdclass();
 $lang->program->kanban->common             = 'Program Kanban';
diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index 3e390eff22..ccff66aef6 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -139,12 +139,12 @@ $lang->program->statusList['doing']     = 'Doing';
 $lang->program->statusList['suspended'] = 'Suspended';
 $lang->program->statusList['closed']    = 'Closed';
 
-$lang->program->featureBar['all']       = 'All';
-$lang->program->featureBar['unclosed']  = 'Unclosed';
-$lang->program->featureBar['wait']      = 'Waiting';
-$lang->program->featureBar['doing']     = 'Doing';
-$lang->program->featureBar['suspended'] = 'Suspended';
-$lang->program->featureBar['closed']    = 'Closed';
+$lang->program->featureBar['browse']['all']       = 'All';
+$lang->program->featureBar['browse']['unclosed']  = 'Unclosed';
+$lang->program->featureBar['browse']['wait']      = 'Waiting';
+$lang->program->featureBar['browse']['doing']     = 'Doing';
+$lang->program->featureBar['browse']['suspended'] = 'Suspended';
+$lang->program->featureBar['browse']['closed']    = 'Closed';
 
 $lang->program->kanban = new stdclass();
 $lang->program->kanban->common             = 'Program Kanban';
diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php
index ed25ecbfb4..16e71859b6 100644
--- a/module/program/lang/fr.php
+++ b/module/program/lang/fr.php
@@ -139,12 +139,12 @@ $lang->program->statusList['doing']     = 'Doing';
 $lang->program->statusList['suspended'] = 'Suspended';
 $lang->program->statusList['closed']    = 'Closed';
 
-$lang->program->featureBar['all']       = 'All';
-$lang->program->featureBar['unclosed']  = 'Unclosed';
-$lang->program->featureBar['wait']      = 'En Attente';
-$lang->program->featureBar['doing']     = 'En Cours';
-$lang->program->featureBar['suspended'] = 'Suspendues';
-$lang->program->featureBar['closed']    = 'Fermées';
+$lang->program->featureBar['browse']['all']       = 'All';
+$lang->program->featureBar['browse']['unclosed']  = 'Unclosed';
+$lang->program->featureBar['browse']['wait']      = 'En Attente';
+$lang->program->featureBar['browse']['doing']     = 'En Cours';
+$lang->program->featureBar['browse']['suspended'] = 'Suspendues';
+$lang->program->featureBar['browse']['closed']    = 'Fermées';
 
 $lang->program->kanban = new stdclass();
 $lang->program->kanban->common             = 'Program Kanban';
diff --git a/module/program/lang/vi.php b/module/program/lang/vi.php
index f819aeebb3..c3f09521cc 100644
--- a/module/program/lang/vi.php
+++ b/module/program/lang/vi.php
@@ -96,7 +96,12 @@ $lang->program->statusList['doing']     = 'Doing';
 $lang->program->statusList['suspended'] = 'Suspended';
 $lang->program->statusList['closed']    = 'Closed';
 
-$lang->program->featureBar['all'] = 'All';
+$lang->program->featureBar['browse']['all']       = 'All';
+$lang->program->featureBar['browse']['unclosed']  = 'Unclosed';
+$lang->program->featureBar['browse']['wait']      = 'Waiting';
+$lang->program->featureBar['browse']['doing']     = 'Doing';
+$lang->program->featureBar['browse']['suspended'] = 'Suspended';
+$lang->program->featureBar['browse']['closed']    = 'Closed';
 
 $lang->program->kanban = new stdclass();
 $lang->program->kanban->common             = 'Program Kanban';
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index 8189008a46..ebdbf77c02 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -139,12 +139,12 @@ $lang->program->statusList['doing']     = '进行中';
 $lang->program->statusList['suspended'] = '已挂起';
 $lang->program->statusList['closed']    = '已关闭';
 
-$lang->program->featureBar['all']       = '所有';
-$lang->program->featureBar['unclosed']  = '未关闭';
-$lang->program->featureBar['wait']      = '未开始';
-$lang->program->featureBar['doing']     = '进行中';
-$lang->program->featureBar['suspended'] = '已挂起';
-$lang->program->featureBar['closed']    = '已关闭';
+$lang->program->featureBar['browse']['all']       = '所有';
+$lang->program->featureBar['browse']['unclosed']  = '未关闭';
+$lang->program->featureBar['browse']['wait']      = '未开始';
+$lang->program->featureBar['browse']['doing']     = '进行中';
+$lang->program->featureBar['browse']['suspended'] = '已挂起';
+$lang->program->featureBar['browse']['closed']    = '已关闭';
 
 $lang->program->kanban = new stdclass();
 $lang->program->kanban->common             = '项目集看板';
diff --git a/module/program/model.php b/module/program/model.php
index 84eef5815d..02154fac4f 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -574,8 +574,12 @@ class programModel extends model
             ->beginIF($browseType == 'bysearch')->andWhere($query)->fi()
             ->beginIF($this->config->systemMode == 'new')->andWhere('t1.type')->eq('project')->fi()
             ->beginIF($this->config->systemMode == 'new' and ($this->cookie->involved or $involved))->andWhere('t2.type')->eq('project')->fi()
-            ->beginIF($browseType != 'all' and $browseType != 'undone' and $browseType != 'bysearch')->andWhere('t1.status')->eq($browseType)->fi()
+            ->beginIF(!in_array($browseType, array('all', 'undone', 'bysearch', 'review'), true))->andWhere('t1.status')->eq($browseType)->fi()
             ->beginIF($browseType == 'undone')->andWhere('t1.status')->in('wait,doing')->fi()
+            ->beginIF($browseType == 'review')
+            ->andWhere("FIND_IN_SET('{$this->app->user->account}', t1.reviewers)")
+            ->andWhere('t1.reviewStatus')->eq('doing')
+            ->fi()
             ->beginIF($path)->andWhere('t1.path')->like($path . '%')->fi()
             ->beginIF(!$queryAll and !$this->app->user->admin and $this->config->systemMode == 'new')->andWhere('t1.id')->in($this->app->user->view->projects)->fi()
             ->beginIF(!$queryAll and !$this->app->user->admin and $this->config->systemMode == 'classic')->andWhere('t1.id')->in($this->app->user->view->sprints)->fi()
diff --git a/module/program/view/browse.html.php b/module/program/view/browse.html.php
index 65c7834846..a259bdc4c5 100644
--- a/module/program/view/browse.html.php
+++ b/module/program/view/browse.html.php
@@ -23,7 +23,8 @@
 <?php endif;?>
 <div id='mainMenu' class='clearfix'>
   <div class="btn-toolBar pull-left">
-    <?php foreach($lang->program->featureBar as $key => $label):?>
+    <?php common::sortFeatureMenu();?>
+    <?php foreach($lang->program->featureBar['browse'] as $key => $label):?>
     <?php $active = $status == $key ? 'btn-active-text' : '';?>
     <?php $label = "<span class='text'>$label</span>";?>
     <?php echo html::a(inlink('browse', "status=$key&orderBy=$orderBy"), $label, '', "class='btn btn-link $active'");?>
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index deab788c45..3c33b5d2dd 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -241,12 +241,14 @@ $lang->project->modelList['scrum']     = "Scrum";
 $lang->project->modelList['waterfall'] = "CMMI";
 $lang->project->modelList['kanban']    = "Kanban";
 
-$lang->project->featureBar['all']       = 'All';
-$lang->project->featureBar['undone']    = 'Unfinished';
-$lang->project->featureBar['wait']      = 'Waiting';
-$lang->project->featureBar['doing']     = 'Doing';
-$lang->project->featureBar['suspended'] = 'Suspended';
-$lang->project->featureBar['closed']    = 'Closed';
+$lang->project->featureBar['browse']['all']       = 'All';
+$lang->project->featureBar['browse']['undone']    = 'Unfinished';
+$lang->project->featureBar['browse']['wait']      = 'Waiting';
+$lang->project->featureBar['browse']['doing']     = 'Doing';
+$lang->project->featureBar['browse']['suspended'] = 'Suspended';
+$lang->project->featureBar['browse']['closed']    = 'Closed';
+
+$lang->project->featureBar['build']['all'] = 'Build List';
 
 $lang->project->aclList['private'] = 'Private (For team members and stakeholders only)';
 $lang->project->aclList['open']    = "Open (accessible with project view permissions)";
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 6330f8cc9a..550055de5b 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -241,12 +241,14 @@ $lang->project->modelList['scrum']     = "Scrum";
 $lang->project->modelList['waterfall'] = "CMMI";
 $lang->project->modelList['kanban']    = "Kanban";
 
-$lang->project->featureBar['all']       = 'All';
-$lang->project->featureBar['undone']    = 'Unfinished';
-$lang->project->featureBar['wait']      = 'Waiting';
-$lang->project->featureBar['doing']     = 'Doing';
-$lang->project->featureBar['suspended'] = 'Suspended';
-$lang->project->featureBar['closed']    = 'Closed';
+$lang->project->featureBar['browse']['all']       = 'All';
+$lang->project->featureBar['browse']['undone']    = 'Unfinished';
+$lang->project->featureBar['browse']['wait']      = 'Waiting';
+$lang->project->featureBar['browse']['doing']     = 'Doing';
+$lang->project->featureBar['browse']['suspended'] = 'Suspended';
+$lang->project->featureBar['browse']['closed']    = 'Closed';
+
+$lang->project->featureBar['build']['all'] = 'Build List';
 
 $lang->project->aclList['private'] = 'Private (For the project leader, team members and stakeholders only)';
 $lang->project->aclList['open']    = "Open (accessible with project view permissions)";
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index 1be54e768a..3ee9ab7866 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -241,12 +241,14 @@ $lang->project->modelList['scrum']     = "Scrum";
 $lang->project->modelList['waterfall'] = "CMMI";
 $lang->project->modelList['kanban']    = "Kanban";
 
-$lang->project->featureBar['all']       = 'All';
-$lang->project->featureBar['undone']    = 'Non Terminées';
-$lang->project->featureBar['wait']      = 'En Attente';
-$lang->project->featureBar['doing']     = 'En Cours';
-$lang->project->featureBar['suspended'] = 'Suspendues';
-$lang->project->featureBar['closed']    = 'Fermées';
+$lang->project->featureBar['browse']['all']       = 'All';
+$lang->project->featureBar['browse']['undone']    = 'Non Terminées';
+$lang->project->featureBar['browse']['wait']      = 'En Attente';
+$lang->project->featureBar['browse']['doing']     = 'En Cours';
+$lang->project->featureBar['browse']['suspended'] = 'Suspendues';
+$lang->project->featureBar['browse']['closed']    = 'Fermées';
+
+$lang->project->featureBar['build']['all'] = 'Build List';
 
 $lang->project->aclList['private'] = 'Private (For team members and stakeholders only)';
 $lang->project->aclList['open']    = "Open (accessible with project view permissions)";
diff --git a/module/project/lang/vi.php b/module/project/lang/vi.php
index 6b22c04e56..7c3bd62dcd 100644
--- a/module/project/lang/vi.php
+++ b/module/project/lang/vi.php
@@ -160,11 +160,13 @@ $lang->project->currencySymbol['SGD'] = 'S$';
 $lang->project->modelList['scrum']     = "Scrum";
 $lang->project->modelList['waterfall'] = "CMMI";
 
-$lang->project->featureBar['all']       = 'All';
-$lang->project->featureBar['doing']     = 'Doing';
-$lang->project->featureBar['wait']      = 'Waiting';
-$lang->project->featureBar['suspended'] = 'Suspended';
-$lang->project->featureBar['closed']    = 'Closed';
+$lang->project->featureBar['browse']['all']       = 'All';
+$lang->project->featureBar['browse']['doing']     = 'Doing';
+$lang->project->featureBar['browse']['wait']      = 'Waiting';
+$lang->project->featureBar['browse']['suspended'] = 'Suspended';
+$lang->project->featureBar['browse']['closed']    = 'Closed';
+
+$lang->project->featureBar['build']['all'] = 'Build List';
 
 $lang->project->aclList['private'] = 'Private (For team members and stakeholders only)';
 $lang->project->aclList['open']    = "Open (accessible with project view permissions)";
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 2a4bc0aeb5..3e1ac80450 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -241,12 +241,14 @@ $lang->project->modelList['scrum']     = "Scrum";
 $lang->project->modelList['waterfall'] = "瀑布";
 $lang->project->modelList['kanban']    = "看板";
 
-$lang->project->featureBar['all']       = '所有';
-$lang->project->featureBar['undone']    = '未完成';
-$lang->project->featureBar['wait']      = '未开始';
-$lang->project->featureBar['doing']     = '进行中';
-$lang->project->featureBar['suspended'] = '已挂起';
-$lang->project->featureBar['closed']    = '已关闭';
+$lang->project->featureBar['browse']['all']       = '所有';
+$lang->project->featureBar['browse']['undone']    = '未完成';
+$lang->project->featureBar['browse']['wait']      = '未开始';
+$lang->project->featureBar['browse']['doing']     = '进行中';
+$lang->project->featureBar['browse']['suspended'] = '已挂起';
+$lang->project->featureBar['browse']['closed']    = '已关闭';
+
+$lang->project->featureBar['build']['all'] = '所有版本';
 
 $lang->project->aclList['private'] = "私有 (只有项目负责人、团队成员和干系人可访问)";
 $lang->project->aclList['open']    = "公开 (有项目视图权限即可访问)";
diff --git a/module/project/model.php b/module/project/model.php
index ae369657db..ea8da3f551 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2355,7 +2355,11 @@ class projectModel extends model
                 ->beginIF($projectID == 0 and $this->config->vision)->andWhere('t1.vision')->eq($this->config->vision)->fi()
                 ->beginIF(!empty($myExecutionIDList))->andWhere('t1.id')->in(array_keys($myExecutionIDList))->fi()
                 ->beginIF($status == 'undone')->andWhere('t1.status')->notIN('done,closed')->fi()
-                ->beginIF($status != 'all' and $status != 'undone' and $status != 'involved')->andWhere('t1.status')->eq($status)->fi()
+                ->beginIF(!in_array($status, array('all', 'undone', 'involved', 'review'), true))->andWhere('t1.status')->eq($status)->fi()
+                ->beginIF($status == 'review')
+                ->andWhere("FIND_IN_SET('{$this->app->user->account}', t1.reviewers)")
+                ->andWhere('t1.reviewStatus')->eq('doing')
+                ->fi()
                 ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->sprints)->fi()
                 ->andWhere('t1.vision')->eq($this->config->vision)
                 ->andWhere('t1.deleted')->eq('0')
diff --git a/module/project/view/browsebycard.html.php b/module/project/view/browsebycard.html.php
index 8bd4074daa..0794d733db 100644
--- a/module/project/view/browsebycard.html.php
+++ b/module/project/view/browsebycard.html.php
@@ -59,7 +59,8 @@
   <div class="btn-toolBar pull-left">
     <?php $excludedEmptyPrograms = array_filter($programs);?>
     <div class="input-control w-150px" id='programBox'><?php echo html::select('programID', $programs, $programID, "onchange=changeProgram(this.value) class='form-control chosen' data-placeholder='{$lang->project->selectProgram}' data-drop_width='" . (empty($excludedEmptyPrograms) ? 170 : 450) . "' data-max_drop_width='0'");?></div>
-    <?php foreach($lang->project->featureBar as $key => $label):?>
+    <?php common::sortFeatureMenu();?>
+    <?php foreach($lang->project->featureBar['browse'] as $key => $label):?>
     <?php $active = $browseType == $key ? 'btn-active-text' : '';?>
     <?php $label = "<span class='text'>$label</span>";?>
     <?php if($browseType == $key) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>
diff --git a/module/project/view/browsebylist.html.php b/module/project/view/browsebylist.html.php
index d89feaeceb..61d7450523 100644
--- a/module/project/view/browsebylist.html.php
+++ b/module/project/view/browsebylist.html.php
@@ -33,7 +33,8 @@
   </div>
   <?php endif;?>
   <div class="btn-toolBar pull-left">
-    <?php foreach($lang->project->featureBar as $key => $label):?>
+    <?php common::sortFeatureMenu();?>
+    <?php foreach($lang->project->featureBar['browse'] as $key => $label):?>
     <?php $active = $browseType == $key ? 'btn-active-text' : '';?>
     <?php $label = "<span class='text'>$label</span>";?>
     <?php if($browseType == $key) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index fd803187a7..100e689765 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -20,14 +20,14 @@
 <div id="mainMenu" class="clearfix table-row">
   <div class="btn-toolbar pull-left">
     <?php
-    $label  = "<span class='text'>{$lang->execution->build}</span>";
-    $active = '';
-    if($type == 'all')
+    common::sortFeatureMenu();
+    foreach($lang->project->featureBar['build'] as $featureType => $label)
     {
-        $active = 'btn-active-text';
-        $label .= " <span class='label label-light label-badge'>{$buildsTotal}</span>";
+        $activeClass = $type == $featureType ? 'btn-active-text' : '';
+        $label       = "<span class='text'>$label</span>";
+        if($type == $featureType) $label .= " <span class='label label-light label-badge'>{$buildsTotal}</span>";
+        echo html::a(inlink('build', "projectID=$projectID&type=$featureType"), $label, '',"class='btn btn-link $activeClass' data-app={$app->tab} id=" . $featureType .'Tab');
     }
-    echo html::a(inlink('build', "projectID=$projectID&type=all"), $label, '', "class='btn btn-link $active' id='all'")
     ?>
     <div class="input-control space w-150px"><?php echo html::select('product', $products, $product, "onchange='changeProduct(this.value)' class='form-control chosen' data-placeholder='{$lang->productCommon}'");?></div>
     <a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->execution->byQuery;?></a>
diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php
index 9172f9bd4b..b0e81cf157 100644
--- a/module/project/view/execution.html.php
+++ b/module/project/view/execution.html.php
@@ -22,6 +22,7 @@
         ?>
       </ul>
     </div>
+    <?php common::sortFeatureMenu('execution', 'all');?>
     <?php foreach($lang->execution->featureBar['all'] as $key => $label):?>
     <?php $label = "<span class='text'>$label</span>";?>
     <?php if($status == $key) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>
diff --git a/module/projectrelease/lang/de.php b/module/projectrelease/lang/de.php
index 0367551d7c..cc566da4fc 100644
--- a/module/projectrelease/lang/de.php
+++ b/module/projectrelease/lang/de.php
@@ -27,3 +27,7 @@ $lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Export as HTML';
 $lang->projectrelease->browseAction     = "Release List";
 $lang->projectrelease->notify           = 'notify';
+
+$lang->projectrelease->featureBar['browse']['all']       = 'All';
+$lang->projectrelease->featureBar['browse']['normal']    = 'Active';
+$lang->projectrelease->featureBar['browse']['terminate'] = 'Terminated';
diff --git a/module/projectrelease/lang/en.php b/module/projectrelease/lang/en.php
index 33e82bde68..a7b64180ce 100644
--- a/module/projectrelease/lang/en.php
+++ b/module/projectrelease/lang/en.php
@@ -27,3 +27,7 @@ $lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Export as HTML';
 $lang->projectrelease->browseAction     = "Release List";
 $lang->projectrelease->notify           = 'notify';
+
+$lang->projectrelease->featureBar['browse']['all']       = 'All';
+$lang->projectrelease->featureBar['browse']['normal']    = 'Active';
+$lang->projectrelease->featureBar['browse']['terminate'] = 'Terminated';
diff --git a/module/projectrelease/lang/fr.php b/module/projectrelease/lang/fr.php
index 9430e39a40..3374f6d3f0 100644
--- a/module/projectrelease/lang/fr.php
+++ b/module/projectrelease/lang/fr.php
@@ -27,3 +27,7 @@ $lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Export HTML';
 $lang->projectrelease->browseAction     = "Release List";
 $lang->projectrelease->notify           = 'notify';
+
+$lang->projectrelease->featureBar['browse']['all']       = 'All';
+$lang->projectrelease->featureBar['browse']['normal']    = 'Active';
+$lang->projectrelease->featureBar['browse']['terminate'] = 'Terminated';
diff --git a/module/projectrelease/lang/vi.php b/module/projectrelease/lang/vi.php
index eae011e6be..3dbe05c0f5 100644
--- a/module/projectrelease/lang/vi.php
+++ b/module/projectrelease/lang/vi.php
@@ -27,3 +27,7 @@ $lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Xuất ra HTML';
 $lang->projectrelease->browseAction     = "Release List";
 $lang->projectrelease->notify           = 'notify';
+
+$lang->projectrelease->featureBar['browse']['all']       = 'All';
+$lang->projectrelease->featureBar['browse']['normal']    = 'Active';
+$lang->projectrelease->featureBar['browse']['terminate'] = 'Terminated';
diff --git a/module/projectrelease/lang/zh-cn.php b/module/projectrelease/lang/zh-cn.php
index c9b07c9de1..414f9d9c9c 100644
--- a/module/projectrelease/lang/zh-cn.php
+++ b/module/projectrelease/lang/zh-cn.php
@@ -27,3 +27,7 @@ $lang->projectrelease->unlinkBug        = '移除Bug';
 $lang->projectrelease->export           = '导出HTML';
 $lang->projectrelease->browseAction     = "发布列表";
 $lang->projectrelease->notify           = "通知";
+
+$lang->projectrelease->featureBar['browse']['all']       = '全部';
+$lang->projectrelease->featureBar['browse']['normal']    = '正常';
+$lang->projectrelease->featureBar['browse']['terminate'] = '停止维护';
diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php
index 04e0a296c3..ba8ff55508 100644
--- a/module/projectrelease/model.php
+++ b/module/projectrelease/model.php
@@ -57,7 +57,8 @@ class projectreleaseModel extends model
             ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build = t3.id')
             ->leftJoin(TABLE_EXECUTION)->alias('t4')->on('t3.execution = t4.id')
             ->where('t1.project')->eq((int)$projectID)
-            ->beginIF($type != 'all')->andWhere('t1.status')->eq($type)->fi()
+            ->beginIF($type != 'all' && $type != 'review')->andWhere('t1.status')->eq($type)->fi()
+            ->beginIF($type == 'review')->andWhere("FIND_IN_SET('{$this->app->user->account}', t1.reviewers)")->fi()
             ->andWhere('t1.deleted')->eq(0)
             ->orderBy($orderBy)
             ->fetchAll();
diff --git a/module/projectrelease/view/browse.html.php b/module/projectrelease/view/browse.html.php
index 55e4f8108e..f748053199 100644
--- a/module/projectrelease/view/browse.html.php
+++ b/module/projectrelease/view/browse.html.php
@@ -16,9 +16,14 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php
-    echo html::a(inlink('browse', "projectID=$projectID&executionID=$executionID&type=all"), "<span class='text'>{$lang->release->all}</span>" . ($type == 'all' ? ' <span class="label label-light label-badge">' . count($releases) . '</span>' : ''), '', "id='allTab' class='btn btn-link" . ('all' == $type ? ' btn-active-text' : '') . "' data-app='$from'");
-    echo html::a(inlink('browse', "projectID=$projectID&executionID=$executionID&type=normal"), "<span class='text'>{$lang->release->statusList['normal']}</span>" . ($type == 'normal' ? ' <span class="label label-light label-badge">' . count($releases) . '</span>' : ''), '', "id='normalTab' class='btn btn-link" . ('normal' == $type ? ' btn-active-text' : '') . "' data-app='$from'");
-    echo html::a(inlink('browse', "projectID=$projectID&executionID=$executionID&type=terminate"), "<span class='text'>{$lang->release->statusList['terminate']}</span>" . ($type == 'terminate' ? ' <span class="label label-light label-badge">' . count($releases) . '</span>' : ''), '', "id='terminateTab' class='btn btn-link" . ('terminate' == $type ? ' btn-active-text' : '') . "' data-app='$from'");
+    common::sortFeatureMenu();
+    foreach($lang->projectrelease->featureBar['browse'] as $featureType => $label)
+    {
+        $active = $type == $featureType ? 'btn-active-text' : '';
+        $label  = "<span class='text'>$label</span>";
+        if($type == $featureType) $label .= " <span class='label label-light label-badge'>" . count($releases) . "</span>";
+        echo html::a(inlink('browse', "projectID={$projectID}&executionID=$executionID&type=$featureType"), $label, '', "id='{$featureType}Tab' data-app='$from' class='btn btn-link $active'");
+    }
     ?>
   </div>
   <div class="btn-toolbar pull-right">
diff --git a/module/release/lang/de.php b/module/release/lang/de.php
index 87c8e43226..b89bab0f5f 100644
--- a/module/release/lang/de.php
+++ b/module/release/lang/de.php
@@ -90,3 +90,7 @@ $lang->release->notifyList['SC'] = 'Story Creator';
 $lang->release->notifyList['ET'] = "{$lang->execution->common} Team Members";
 $lang->release->notifyList['PT'] = "Project Team Members";
 $lang->release->notifyList['CT'] = "Copy To";
+
+$lang->release->featureBar['browse']['all']       = $lang->release->all;
+$lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
+$lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index 2a3824a08c..cb985d492a 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -90,3 +90,7 @@ $lang->release->notifyList['SC'] = 'Story Creator';
 $lang->release->notifyList['ET'] = "{$lang->execution->common} Team Members";
 $lang->release->notifyList['PT'] = "Project Team Members";
 $lang->release->notifyList['CT'] = "Copy To";
+
+$lang->release->featureBar['browse']['all']       = $lang->release->all;
+$lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
+$lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
diff --git a/module/release/lang/fr.php b/module/release/lang/fr.php
index 0431df964a..73eb1dcdfd 100644
--- a/module/release/lang/fr.php
+++ b/module/release/lang/fr.php
@@ -90,3 +90,7 @@ $lang->release->notifyList['SC'] = 'Story Creator';
 $lang->release->notifyList['ET'] = "{$lang->execution->common} Team Members";
 $lang->release->notifyList['PT'] = "Project Team Members";
 $lang->release->notifyList['CT'] = "Copy To";
+
+$lang->release->featureBar['browse']['all']       = $lang->release->all;
+$lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
+$lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
diff --git a/module/release/lang/vi.php b/module/release/lang/vi.php
index f79f56718d..4861c32caf 100644
--- a/module/release/lang/vi.php
+++ b/module/release/lang/vi.php
@@ -84,3 +84,7 @@ $lang->release->notifyList['QD'] = 'QA Manager';
 $lang->release->notifyList['SC'] = 'Story Creator';
 $lang->release->notifyList['ET'] = "{$lang->execution->common} Team Members";
 $lang->release->notifyList['PT'] = "Project Team Members";
+
+$lang->release->featureBar['browse']['all']       = $lang->release->all;
+$lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
+$lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index da700453d3..60585a1fda 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -90,3 +90,7 @@ $lang->release->notifyList['SC'] = '需求提交人';
 $lang->release->notifyList['ET'] = "所在{$lang->execution->common}团队成员";
 $lang->release->notifyList['PT'] = "所在项目团队成员";
 $lang->release->notifyList['CT'] = "抄送给";
+
+$lang->release->featureBar['browse']['all']       = $lang->release->all;
+$lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
+$lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
diff --git a/module/release/model.php b/module/release/model.php
index 3e3695d16f..eb57ae9c8e 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -61,7 +61,8 @@ class releaseModel extends model
             ->where('t1.deleted')->eq(0)
             ->beginIF($productID)->andWhere('t1.product')->eq((int)$productID)->fi()
             ->beginIF($branch !== 'all')->andWhere('t1.branch')->eq($branch)->fi()
-            ->beginIF($type != 'all')->andWhere('t1.status')->eq($type)->fi()
+            ->beginIF($type != 'all' && $type != 'review')->andWhere('t1.status')->eq($type)->fi()
+            ->beginIF($type == 'review')->andWhere("FIND_IN_SET('{$this->app->user->account}', t1.reviewers)")->fi()
             ->orderBy($orderBy)
             ->page($pager)
             ->fetchAll();
@@ -143,6 +144,8 @@ class releaseModel extends model
             ->setIF($projectID, 'project', $projectID)
             ->setIF($this->post->build == false, 'build', 0)
             ->setDefault('stories', '')
+            ->setDefault('createdBy',   $this->app->user->account)
+            ->setDefault('createdDate', helper::now())
             ->join('stories', ',')
             ->join('bugs', ',')
             ->join('mailto', ',')
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index c3920a3f16..cccf46cd3a 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -16,9 +16,14 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php
-    echo html::a(inlink('browse', "productID={$product->id}&branch=$branch&type=all"), "<span class='text'>{$lang->release->all}</span>" . ($type == 'all' ? ' <span class="label label-light label-badge">' . $pager->recTotal . '</span>' : ''), '', "id='allTab' class='btn btn-link" . ('all' == $type ? ' btn-active-text' : '') . "'");
-    echo html::a(inlink('browse', "productID={$product->id}&branch=$branch&type=normal"), "<span class='text'>{$lang->release->statusList['normal']}</span>" . ($type == 'normal' ? ' <span class="label label-light label-badge">' . $pager->recTotal . '</span>' : ''), '', "id='normalTab' class='btn btn-link" . ('normal' == $type ? ' btn-active-text' : '') . "'");
-    echo html::a(inlink('browse', "productID={$product->id}&branch=$branch&type=terminate"), "<span class='text'>{$lang->release->statusList['terminate']}</span>" . ($type == 'terminate' ? ' <span class="label label-light label-badge">' . $pager->recTotal . '</span>' : ''), '', "id='terminateTab' class='btn btn-link" . ('terminate' == $type ? ' btn-active-text' : '') . "'");
+    common::sortFeatureMenu();
+    foreach($lang->release->featureBar['browse'] as $featureType => $label)
+    {
+        $active = $type == $featureType ? 'btn-active-text' : '';
+        $label  = "<span class='text'>$label</span>";
+        if($type == $featureType) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
+        echo html::a(inlink('browse', "productID={$product->id}&branch=$branch&type=$featureType"), $label, '', "id='{$featureType}Tab' class='btn btn-link $active'");
+    }
     ?>
   </div>
   <div class="btn-toolbar pull-right">
diff --git a/module/search/model.php b/module/search/model.php
index 9f19cd38ad..30eb8a92e5 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -24,45 +24,67 @@ class searchModel extends model
     public function setSearchParams($searchConfig)
     {
         $module = $searchConfig['module'];
+
         if($this->config->edition != 'open')
         {
             $flowModule = $module;
-            if($module == 'projectStory') $flowModule = 'story';
-            if($module == 'projectBug')   $flowModule = 'bug';
+            if($module == 'projectStory' || $module == 'executionStory') $flowModule = 'story';
+            if($module == 'projectBug') $flowModule = 'bug';
 
-            $fields   = $this->loadModel('workflowfield')->getList($flowModule);
-            $maxCount = $this->config->maxCount;
-            $this->config->maxCount = 0;
+            $buildin = false;
 
-            foreach($fields as $field)
+            $this->app->loadLang('workflow');
+            $this->app->loadConfig('workflow');
+            if(!empty($this->config->workflow->buildin))
             {
-                if($field->canSearch == 0) continue;
-
-                /* The built-in modules and user defined modules all have the subStatus field, so set its configuration first. */
-                if($field->field == 'subStatus')
+                foreach($this->config->workflow->buildin->modules as $appName => $appModules)
                 {
-                    $field = $this->workflowfield->getByField($flowModule, 'subStatus');
-                    if(!isset($field->options[''])) $field->options[''] = '';
+                    if(isset($appModules->$flowModule))
+                    {
+                        $buildin = true;
+                        break;
+                    }
+                }
+            }
 
-                    $searchConfig['fields'][$field->field] = $field->name;
-                    $searchConfig['params'][$field->field] = array('operator' => '=', 'control' => 'select', 'values' => $field->options);
+            if($buildin)
+            {
+                $fields   = $this->loadModel('workflowfield')->getList($flowModule, 'searchOrder, `order`, id');
+                $maxCount = $this->config->maxCount;
+                $this->config->maxCount = 0;
 
-                    continue;
+                $fieldValues = array();
+                $formName    = $module . 'Form';
+                if($this->session->$formName)
+                {
+                    foreach($this->session->$formName as $formKey => $formField)
+                    {
+                        if(strpos($formKey, 'field') !== false)
+                        {
+                            $fieldNO      = substr($formKey, 5);
+                            $fieldNO      = "value" . $fieldNO;
+                            $formNameList = $this->session->$formName;
+                            $fieldValue   = $formNameList[$fieldNO];
+
+                            if($fieldValue) $fieldValues[$formField][$fieldValue] = $fieldValue;
+                        }
+                    }
                 }
 
-                /* The other built-in fields do not need to set their configuration. */
-                if($field->buildin) continue;
+                foreach($fields as $field)
+                {
+                    if($field->canSearch == 0 || $field->buildin) continue;
 
-                /* Set configuration for user defined fields. */
-                $operator = ($field->control == 'input' or $field->control == 'textarea') ? 'include' : '=';
-                $control  = ($field->control == 'select' or $field->control == 'multi-select' or $field->control == 'radio' or $field->control == 'checkbox') ? 'select' : 'input';
-                $options  = $this->workflowfield->getFieldOptions($field);
-                $class    = ($field->control == 'date' or $field->control == 'datetime') ? 'date' : ''; // Set date zui for date and datetime control.
+                    if(in_array($field->control, $this->config->workflowfield->optionControls))
+                    {
+                        $field->options = $this->workflowfield->getFieldOptions($field, true, zget($fieldValues, $field->field, ''), '', $this->config->flowLimit);
+                    }
 
-                $searchConfig['fields'][$field->field] = $field->name;
-                $searchConfig['params'][$field->field] = array('operator' => $operator, 'control' => $control,  'values' => $options, 'class' => $class);
+                    $searchConfig['fields'][$field->field] = $field->name;
+                    $searchConfig['params'][$field->field] = $this->loadModel('flow', 'sys')->processSearchParams($field->control, $field->options);
+                }
+                $this->config->maxCount = $maxCount;
             }
-            $this->config->maxCount = $maxCount;
         }
 
         $searchParams['module']       = $searchConfig['module'];
diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index 5612ad6422..a4a1583a6c 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -447,3 +447,6 @@ $lang->story->subDivideTip['subStory']  = 'The Sub-stories cannot be subdivided.
 $lang->story->subDivideTip['planned']   = 'The Story has been planned and cannot be subdivided.';
 $lang->story->subDivideTip['projected'] = 'The Story has been initiated and cannot be subdivided.';
 $lang->story->subDivideTip['notActive'] = 'The Story is not active and cannot be subdivided.';
+
+$lang->story->featureBar['browse']['all']      = $lang->all;
+$lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 8048b2ad27..ad443af1b3 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -447,3 +447,6 @@ $lang->story->subDivideTip['subStory']  = 'The Sub-stories cannot be subdivided.
 $lang->story->subDivideTip['planned']   = 'The Story has been planned and cannot be subdivided.';
 $lang->story->subDivideTip['projected'] = 'The Story has been initiated and cannot be subdivided.';
 $lang->story->subDivideTip['notActive'] = 'The Story is not active and cannot be subdivided.';
+
+$lang->story->featureBar['browse']['all']      = $lang->all;
+$lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index a1c65d585f..ef77ed0716 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -447,3 +447,6 @@ $lang->story->subDivideTip['subStory']  = 'Les sous-stories ne peuvent pas être
 $lang->story->subDivideTip['planned']   = 'Cette Story est planifiée et ne peut être subdivisée.';
 $lang->story->subDivideTip['projected'] = 'Cette Story a été créée et ne peut être subdivisée.';
 $lang->story->subDivideTip['notActive'] = "Cette Story n'est pas active et ne peut être subdivisée.";
+
+$lang->story->featureBar['browse']['all']      = $lang->all;
+$lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php
index fcd4ee08ac..8cb2bb50bc 100644
--- a/module/story/lang/vi.php
+++ b/module/story/lang/vi.php
@@ -439,3 +439,6 @@ $lang->story->subDivideTip['subStory']  = 'The Sub-stories cannot be subdivided.
 $lang->story->subDivideTip['planned']   = 'The Story has been planned and cannot be subdivided.';
 $lang->story->subDivideTip['projected'] = 'The Story has been initiated and cannot be subdivided.';
 $lang->story->subDivideTip['notActive'] = 'The Story is not active and cannot be subdivided.';
+
+$lang->story->featureBar['browse']['all']      = $lang->all;
+$lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 79788b4d73..8643c48c88 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -447,3 +447,6 @@ $lang->story->subDivideTip['subStory']  = '子需求无法细分';
 $lang->story->subDivideTip['planned']   = '该需求已计划，无法进行细分操作';
 $lang->story->subDivideTip['projected'] = '该需求已立项，无法进行细分操作';
 $lang->story->subDivideTip['notActive'] = '需求不是激活状态，无法进行细分操作';
+
+$lang->story->featureBar['browse']['all']      = $lang->all;
+$lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
diff --git a/module/task/model.php b/module/task/model.php
index f8001be55f..1a1e762fc9 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2385,9 +2385,13 @@ class taskModel extends model
             ->markRight(1)
             ->fi()
             ->beginIF($type == 'delayed')->andWhere('t1.deadline')->gt('1970-1-1')->andWhere('t1.deadline')->lt(date(DT_DATE1))->andWhere('t1.status')->in('wait,doing')->fi()
-            ->beginIF(is_array($type) or strpos(',all,undone,needconfirm,assignedtome,delayed,finishedbyme,myinvolved,assignedbyme,', ",$type,") === false)->andWhere('t1.status')->in($type)->fi()
+            ->beginIF(is_array($type) or strpos(',all,undone,needconfirm,assignedtome,delayed,finishedbyme,myinvolved,assignedbyme,review,', ",$type,") === false)->andWhere('t1.status')->in($type)->fi()
             ->beginIF($modules)->andWhere('t1.module')->in($modules)->fi()
             ->beginIF($type == 'assignedbyme')->andWhere('t1.id')->in($actionIDList)->andWhere('t1.status')->ne('closed')->fi()
+            ->beginIF($type == 'review')
+            ->andWhere("FIND_IN_SET('{$this->app->user->account}', t1.reviewers)")
+            ->andWhere('t1.reviewStatus')->eq('doing')
+            ->fi()
             ->andWhere('t1.deleted')->eq(0)
             ->orderBy($orderBy)
             ->page($pager, 't1.id')
diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index 7f10daebfd..0c783ee535 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -50,6 +50,7 @@ class testsuite extends control
      * Browse test suites.
      *
      * @param  int    $productID
+     * @param  string $type
      * @param  string $orderBy
      * @param  int    $recTotal
      * @param  int    $recPerPage
@@ -57,7 +58,7 @@ class testsuite extends control
      * @access public
      * @return void
      */
-    public function browse($productID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function browse($productID = 0, $type = 'all', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save session. */
         $this->session->set('testsuiteList', $this->app->getURI(true), 'qa');
@@ -78,7 +79,7 @@ class testsuite extends control
         if(empty($suites) and $pageID > 1)
         {
             $pager  = pager::init(0, $recPerPage, 1);
-            $suites = $this->testsuite->getSuites($productID, $sort, $pager, 'all');
+            $suites = $this->testsuite->getSuites($productID, $sort, $pager, $type);
         }
 
         $this->view->title       = $productName . $this->lang->testsuite->common;
@@ -89,6 +90,7 @@ class testsuite extends control
         $this->view->productName = $productName;
         $this->view->orderBy     = $orderBy;
         $this->view->suites      = $suites;
+        $this->view->type        = $type;
         $this->view->users       = $this->loadModel('user')->getPairs('noclosed|noletter');
         $this->view->pager       = $pager;
         $this->view->product     = $this->product->getByID($productID);
diff --git a/module/testsuite/lang/de.php b/module/testsuite/lang/de.php
index e24e9142cf..87f5b051b0 100644
--- a/module/testsuite/lang/de.php
+++ b/module/testsuite/lang/de.php
@@ -54,3 +54,5 @@ $lang->testsuite->lblUnlinkCase = 'Unverknüpfte Fälle';
 
 $lang->testsuite->authorList['private'] = 'Privat';
 $lang->testsuite->authorList['public']  = 'Öffentlich';
+
+$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php
index 013fe21932..ad27dd4346 100644
--- a/module/testsuite/lang/en.php
+++ b/module/testsuite/lang/en.php
@@ -54,3 +54,5 @@ $lang->testsuite->lblUnlinkCase = 'Unlink Case';
 
 $lang->testsuite->authorList['private'] = 'Private';
 $lang->testsuite->authorList['public']  = 'Public';
+
+$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
diff --git a/module/testsuite/lang/fr.php b/module/testsuite/lang/fr.php
index 93538e4cbb..40d8c6b906 100644
--- a/module/testsuite/lang/fr.php
+++ b/module/testsuite/lang/fr.php
@@ -54,3 +54,5 @@ $lang->testsuite->lblUnlinkCase = 'Retirer CasTest';
 
 $lang->testsuite->authorList['private'] = 'Privé';
 $lang->testsuite->authorList['public']  = 'Public';
+
+$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
diff --git a/module/testsuite/lang/vi.php b/module/testsuite/lang/vi.php
index f6d989ae25..f262b8932f 100644
--- a/module/testsuite/lang/vi.php
+++ b/module/testsuite/lang/vi.php
@@ -51,3 +51,5 @@ $lang->testsuite->lblUnlinkCase = 'Hủy liên kết tình huống';
 
 $lang->testsuite->authorList['private'] = 'Riêng tư';
 $lang->testsuite->authorList['public']  = 'Công khai';
+
+$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
diff --git a/module/testsuite/lang/zh-cn.php b/module/testsuite/lang/zh-cn.php
index 114a225bcc..3ac13b0a20 100644
--- a/module/testsuite/lang/zh-cn.php
+++ b/module/testsuite/lang/zh-cn.php
@@ -54,3 +54,5 @@ $lang->testsuite->lblUnlinkCase = '移除用例';
 
 $lang->testsuite->authorList['private'] = '私有';
 $lang->testsuite->authorList['public']  = '公开';
+
+$lang->testsuite->featureBar['browse']['all'] = '套件列表';
diff --git a/module/testsuite/view/browse.html.php b/module/testsuite/view/browse.html.php
index b6d0ffc989..05d7aa1291 100644
--- a/module/testsuite/view/browse.html.php
+++ b/module/testsuite/view/browse.html.php
@@ -15,10 +15,16 @@
 <?php js::set('flow', $config->global->flow);?>
 <div id="mainMenu" class='clearfix'>
   <div class="btn-toolbar pull-left">
-    <a href class='btn btn-link btn-active-text'>
-      <span class='text'><?php echo $lang->testsuite->browse?></span>
-      <span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>
-    </a>
+    <?php
+    common::sortFeatureMenu();
+    foreach($lang->testsuite->featureBar['browse'] as $featureType => $label)
+    {
+        $activeClass = $type == $featureType ? 'btn-active-text' : '';
+        $label       = "<span class='text'>$label</span>";
+        if($type == $featureType) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
+        echo html::a(inlink('browse', "productID=$productID&type=$featureType"), $label, '',"class='btn btn-link $activeClass'");
+    }
+    ?>
   </div>
   <?php if(common::canModify('product', $product)):?>
   <div class="btn-toolbar pull-right">
@@ -39,7 +45,7 @@
   <?php else:?>
   <table class='table has-sort-head' id='suiteList'>
     <thead>
-    <?php $vars = "productID=$productID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
+    <?php $vars = "productID=$productID&type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
       <tr>
         <th class='c-id text-left'><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
         <th class='c-name text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->testsuite->name);?></th>
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 0e9a9dbb14..bfd9815d95 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -31,6 +31,8 @@ class testtaskModel extends model
         $task = fixer::input('post')
             ->setDefault('build', '')
             ->setIF($this->config->systemMode == 'new', 'project', $projectID)
+            ->setDefault('createdBy', $this->app->user->account)
+            ->setDefault('createdDate', helper::now())
             ->stripTags($this->config->testtask->editor->create['id'], $this->config->allowedTags)
             ->join('mailto', ',')
             ->join('type', ',')
@@ -86,7 +88,7 @@ class testtaskModel extends model
             ->beginIF($scopeAndStatus[0] == 'local')->andWhere('t1.product')->eq((int)$productID)->fi()
             ->beginIF($scopeAndStatus[0] == 'all')->andWhere('t1.product')->in($products)->fi()
             ->beginIF(strtolower($scopeAndStatus[1]) == 'totalstatus')->andWhere('t1.status')->in('blocked,doing,wait,done')->fi()
-            ->beginIF(strtolower($scopeAndStatus[1]) != 'totalstatus')->andWhere('t1.status')->eq($scopeAndStatus[1])->fi()
+            ->beginIF(!in_array(strtolower($scopeAndStatus[1]), array('totalstatus', 'review'), true))->andWhere('t1.status')->eq($scopeAndStatus[1])->fi()
             ->beginIF($branch !== 'all')->andWhere('t4.branch')->eq($branch)->fi()
             ->beginIF($beginTime)->andWhere('t1.begin')->ge($beginTime)->fi()
             ->beginIF($endTime)->andWhere('t1.end')->le($endTime)->fi()
@@ -95,6 +97,10 @@ class testtaskModel extends model
             ->andWhere('t1.product')->eq((int)$productID)
             ->markRight(1)
             ->fi()
+            ->beginIF($scopeAndStatus[1] == 'review')
+            ->andWhere("FIND_IN_SET('{$this->app->user->account}', t1.reviewers)")
+            ->andWhere('t1.reviewStatus')->eq('doing')
+            ->fi()
             ->orderBy($orderBy)
             ->page($pager)
             ->fetchAll('id');
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index 8b6cee92ab..0a636ab293 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -34,6 +34,7 @@ $status = $this->session->testTaskVersionStatus;
         ?>
       </ul>
     </div>
+    <?php common::sortFeatureMenu();?>
     <?php foreach($lang->testtask->featureBar['browse'] as $key => $label):?>
     <?php $key = strtolower($key);?>
     <?php echo html::a(inlink('browse', "productID=$productID&branch=$branch&type=$scope,$key"), "<span class='text'>$label</span>", '', "id='{$key}Tab' class='btn btn-link'");?>
diff --git a/module/upgrade/config.php b/module/upgrade/config.php
index 9b79b1efbd..38f4ac22d8 100644
--- a/module/upgrade/config.php
+++ b/module/upgrade/config.php
@@ -370,3 +370,56 @@ $config->delete['17_2'][] = 'extension/lite/extension/lite/workflowrule/ext/view
 $config->upgrade->openModules = array('action', 'admin', 'api', 'automation', 'backup', 'block', 'branch', 'budget', 'bug', 'build', 'caselib', 'ci', 'client', 'common', 'company', 'compile', 'convert', 'cron', 'custom', 'datatable', 'dept', 'design', 'dev', 'doc', 'durationestimation', 'entry', 'execution', 'extension', 'file', 'git', 'gitlab', 'group', 'holiday', 'im', 'index', 'index.html', 'install', 'issue', 'jenkins', 'job', 'kanban', 'license', 'mail', 'message', 'misc', 'mr', 'my', 'personnel', 'pipeline', 'product', 'productplan', 'productset', 'program', 'programplan', 'project', 'projectbuild', 'projectrelease', 'projectstory', 'qa', 'release', 'repo', 'report', 'risk', 'score', 'search', 'setting', 'sonarqube', 'sso', 'stage', 'stakeholder', 'story', 'subject', 'svn', 'task', 'testcase', 'testreport', 'testsuite', 'testtask', 'todo', 'tree', 'tutorial', 'upgrade', 'user', 'webhook', 'weekly', 'workestimation', 'gitea');
 
 $config->upgrade->unsetModules = array('design', 'program', 'programplan', 'projectbuild', 'projectrelease', 'stage', 'stakeholder', 'product', 'branch', 'productplan', 'release', 'build', 'qa', 'bug', 'testcase', 'testtask', 'testreport', 'testsuite', 'caselib', 'automation', 'repo', 'ci', 'compile', 'jenkins', 'job', 'svn', 'gitlab', 'sonarqube', 'mr', 'git', 'report', 'sqlbuilder', 'feedback', 'faq', 'attend', 'holiday', 'leave', 'makeup', 'overtime', 'lieu', 'ops', 'host', 'serverroom', 'account', 'domain', 'service', 'deploy', 'conference', 'traincourse', 'pssp', 'baseline', 'classify', 'cm', 'cmcl', 'auditcl', 'reviewcl', 'process', 'activity', 'zoutput', 'auditplan', 'nc', 'subject', 'weekly', 'workestimation', 'issue', 'durationestimation', 'risk', 'opportunity', 'trainplan', 'gapanalysis', 'researchplan', 'researchreport', 'meeting', 'meetingroom', 'budget', 'reviewissue', 'reviewsetting', 'review', 'milestone', 'measurement', 'measrecord', 'assetlib', 'setting', 'im', 'client', 'ldap', 'dev', 'api', 'gitea');
+
+global $lang;
+$config->upgrade->defaultActions = array();
+$config->upgrade->defaultActions['type']          = 'single';
+$config->upgrade->defaultActions['extensionType'] = 'none';
+$config->upgrade->defaultActions['batchMode']     = 'different';
+$config->upgrade->defaultActions['layout']        = 'normal';
+$config->upgrade->defaultActions['show']          = 'direct';
+$config->upgrade->defaultActions['order']         = 0;
+$config->upgrade->defaultActions['buildin']       = 1;
+$config->upgrade->defaultActions['role']          = 'buildin';
+$config->upgrade->defaultActions['virtual']       = 0;
+$config->upgrade->defaultActions['status']        = 'enable';
+$config->upgrade->defaultActions['vision']        = 'rnd';
+
+$config->upgrade->recoveryActions = new stdclass();
+$config->upgrade->recoveryActions->feedback = new stdclass();
+$config->upgrade->recoveryActions->feedback->review = array();
+$config->upgrade->recoveryActions->feedback->review['action']   = 'review';
+$config->upgrade->recoveryActions->feedback->review['module']   = 'feedback';
+$config->upgrade->recoveryActions->feedback->review['name']     = $lang->upgrade->recoveryActions->review;
+$config->upgrade->recoveryActions->feedback->review['method']   = 'operate';
+$config->upgrade->recoveryActions->feedback->review['open']     = 'modal';
+$config->upgrade->recoveryActions->feedback->review['position'] = 'browseandview';
+$config->upgrade->recoveryActions->feedback->review['hasLite']  = true;
+
+$config->upgrade->recoveryActions->task = new stdclass();
+$config->upgrade->recoveryActions->task->review = array();
+$config->upgrade->recoveryActions->task->review['action']   = 'cancel';
+$config->upgrade->recoveryActions->task->review['module']   = 'task';
+$config->upgrade->recoveryActions->task->review['name']     = $lang->upgrade->recoveryActions->cancel;
+$config->upgrade->recoveryActions->task->review['method']   = 'operate';
+$config->upgrade->recoveryActions->task->review['open']     = 'modal';
+$config->upgrade->recoveryActions->task->review['position'] = 'view';
+$config->upgrade->recoveryActions->task->review['hasLite']  = true;
+
+$config->upgrade->recoveryActions->story = new stdclass();
+$config->upgrade->recoveryActions->story->review = array();
+$config->upgrade->recoveryActions->story->review['action']   = 'review';
+$config->upgrade->recoveryActions->story->review['module']   = 'story';
+$config->upgrade->recoveryActions->story->review['name']     = $lang->upgrade->recoveryActions->review;
+$config->upgrade->recoveryActions->story->review['method']   = 'operate';
+$config->upgrade->recoveryActions->story->review['open']     = 'normal';
+$config->upgrade->recoveryActions->story->review['position'] = 'browseandview';
+
+$config->upgrade->recoveryActions->testcase = new stdclass();
+$config->upgrade->recoveryActions->testcase->review = array();
+$config->upgrade->recoveryActions->testcase->review['action']   = 'review';
+$config->upgrade->recoveryActions->testcase->review['module']   = 'testcase';
+$config->upgrade->recoveryActions->testcase->review['name']     = $lang->upgrade->recoveryActions->review;
+$config->upgrade->recoveryActions->testcase->review['method']   = 'operate';
+$config->upgrade->recoveryActions->testcase->review['open']     = 'normal';
+$config->upgrade->recoveryActions->testcase->review['position'] = 'browseandview';
diff --git a/module/upgrade/lang/de.php b/module/upgrade/lang/de.php
index 95d0e128e0..d3c660ca0a 100644
--- a/module/upgrade/lang/de.php
+++ b/module/upgrade/lang/de.php
@@ -156,3 +156,7 @@ $lang->upgrade->createExecutionTip = <<<EOT
 EOT;
 
 include dirname(__FILE__) . '/version.php';
+
+$lang->upgrade->recoveryActions = new stdclass();
+$lang->upgrade->recoveryActions->cancel = 'Cancel';
+$lang->upgrade->recoveryActions->review = 'Review';
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index d49e2a347e..ed17339f3a 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -156,3 +156,7 @@ $lang->upgrade->createExecutionTip = <<<EOT
 EOT;
 
 include dirname(__FILE__) . '/version.php';
+
+$lang->upgrade->recoveryActions = new stdclass();
+$lang->upgrade->recoveryActions->cancel = 'Cancel';
+$lang->upgrade->recoveryActions->review = 'Review';
diff --git a/module/upgrade/lang/fr.php b/module/upgrade/lang/fr.php
index 6ef2076719..002f69d024 100644
--- a/module/upgrade/lang/fr.php
+++ b/module/upgrade/lang/fr.php
@@ -156,3 +156,7 @@ $lang->upgrade->createExecutionTip = <<<EOT
 EOT;
 
 include dirname(__FILE__) . '/version.php';
+
+$lang->upgrade->recoveryActions = new stdclass();
+$lang->upgrade->recoveryActions->cancel = 'Cancel';
+$lang->upgrade->recoveryActions->review = 'Review';
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index fe6ddff5d4..17d94fe009 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -156,3 +156,7 @@ $lang->upgrade->createExecutionTip = <<<EOT
 EOT;
 
 include dirname(__FILE__) . '/version.php';
+
+$lang->upgrade->recoveryActions = new stdclass();
+$lang->upgrade->recoveryActions->cancel = '取消';
+$lang->upgrade->recoveryActions->review = '评审';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index b9c8b31d24..33c73b59a2 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -531,6 +531,7 @@ class upgradeModel extends model
             case '17_3':
                 $this->processBugLinkBug();
             case '17_4':
+                $this->processCreatedInfo();
                 $this->changeSearchTableEngine();
         }
 
@@ -676,6 +677,9 @@ class upgradeModel extends model
             case 'biz7.0':
                 $this->processFlowPosition();
                 break;
+            case 'biz7.3':
+                $this->updateApproval();
+                break;
         }
     }
 
@@ -982,6 +986,8 @@ class upgradeModel extends model
                 $confirmContent .= file_get_contents($this->getUpgradeFile('17.3'));
                 $xuanxuanSql     = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan6.0.1.sql';
                 $confirmContent .= file_get_contents($xuanxuanSql);
+            case '17_4':
+                $confirmContent .= file_get_contents($this->getUpgradeFile('17.4'));
         }
 
         return $confirmContent;
@@ -6750,4 +6756,75 @@ class upgradeModel extends model
         if($mysqlVersion >= 5.6) $this->dao->exec("ALTER TABLE " . TABLE_SEARCHINDEX . " ENGINE='InnoDB'");
         return true;
     }
+
+    /**
+     * Process created information.
+     *
+     * @access public
+     * @return void
+     */
+    public function processCreatedInfo()
+    {
+        $objectTypes = array('productplan', 'release', 'testtask');
+        $tables      = array('productplan' => TABLE_PRODUCTPLAN, 'release' => TABLE_RELEASE, 'testtask' => TABLE_TESTTASK);
+
+        $actions = $this->dao->select('objectType, objectID, actor, date')->from(TABLE_ACTION)->where('objectType')->in($objectTypes)->andWhere('action')->eq('opened')->fetchGroup('objectType');
+        foreach($actions as $objectType => $objectActions)
+        {
+            foreach($objectActions as $action)
+            {
+                $this->dao->update($tables[$objectType])->set('createdBy')->eq($action->actor)->set('createdDate')->eq($action->date)->where('id')->eq($action->objectID)->exec();
+            }
+        }
+
+        return !dao::isError();
+    }
+
+    /**
+     * Update approval process in Workflow.
+     *
+     * @access public
+     * @return void
+     */
+    public function updateApproval()
+    {
+        /* Judge whether the action has opened the approval process before. */
+        /* 判断动作 看之前是否开启过审批流 */
+        $actions = $this->dao->select('id, module, action, createdDate')->from(TABLE_WORKFLOWACTION)
+            ->where('role')->eq('approval')
+            ->andWhere('action')->in('submit, cancel, review')
+            ->fetchAll('id');
+
+        foreach($actions as $id => $action)
+        {
+            $module     = $action->module;
+            $actionCode = $action->action;
+
+            $this->dao->update(TABLE_WORKFLOWACTION)->set('action')->eq('approval' . $action->action)->where('id')->eq($id)->exec();
+            /* Change the approval action of the module that has already enabled the approval function */
+            /* 改原来已经开启过审批功能的模块的审批动作 */
+            if(isset($this->config->upgrade->recoveryActions->{$module}->{$actionCode}))
+            {
+                $data = array_merge($this->config->upgrade->defaultActions, $this->config->upgrade->recoveryActions->{$module}->{$actionCode});
+                if(isset($data['hasLite']) && $data['hasLite'] === true)
+                {
+                    unset($data['hasLite']);
+                    $liteData = $data;
+                    $liteData['vision'] = 'lite';
+                    $this->dao->insert(TABLE_WORKFLOWACTION)->data($liteData)->exec();
+                }
+                $this->dao->insert(TABLE_WORKFLOWACTION)->data($data)->exec();
+            }
+
+            /* Change history */
+            /* 改历史记录 */
+            $this->dao->update(TABLE_ACTION)->set('action')->eq('approval' . $action->action)->where('objectType')->eq($module)->andWhere('action')->eq($action->action)->andWhere('date')->gt($action->createdDate)->exec();
+
+            /* Change the action field of the workflowlayout table */
+            /* 改workflowlayout表的action字段 */
+            $this->dao->update(TABLE_WORKFLOWLAYOUT)->set('action')->eq('approval' . $action->action)->where('module')->eq($module)->andWhere('action')->eq($action->action)->exec();
+        }
+
+        return !dao::isError();
+    }
 }