diff --git a/extensions/bootstrap/CHANGELOG.md b/extensions/bootstrap/CHANGELOG.md
index 908056cc0f..93c3ff4a65 100644
--- a/extensions/bootstrap/CHANGELOG.md
+++ b/extensions/bootstrap/CHANGELOG.md
@@ -5,6 +5,7 @@ Yii Framework 2 bootstrap extension Change Log
 -----------------------
 
 - Bug #5570: `yii\bootstrap\Tabs` would throw an exception if `content` is not set for one of its `items` (RomeroMsk)
+- Enh #5735: Added `yii\bootstrap\Tabs::renderTabContent` to support manually rendering tab contents (RomeroMsk)
 
 
 2.0.0 October 12, 2014
diff --git a/extensions/bootstrap/Tabs.php b/extensions/bootstrap/Tabs.php
index 19e2a69e41..54438189dd 100644
--- a/extensions/bootstrap/Tabs.php
+++ b/extensions/bootstrap/Tabs.php
@@ -102,7 +102,9 @@ class Tabs extends Widget
      */
     public $navType = 'nav-tabs';
     /**
-     * @var boolean whether the tab-content container should be rendered.
+     * @var boolean whether to render the `tab-content` container and its content. You may set this property
+     * to be false so that you can manually render `tab-content` yourself in case your tab contents are complex.
+     * @since 2.0.1
      */
     public $renderTabContent = true;
 
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index b18cd00a7f..aaa770a1f6 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -22,6 +22,7 @@ Yii Framework 2 Change Log
 - Enh #5600: Allow configuring debug panels in `yii\debug\Module::panels` as panel class name strings (qiangxue)
 - Enh #5613: Added `--overwrite` option to Gii console command to support overwriting all files (motin, qiangxue)
 - Enh #5646: Call `yii\base\ErrorHandler::unregister()` instead of `restore_*_handlers` directly (aivus)
+- Enh #5735: Added `yii\bootstrap\Tabs::renderTabContent` to support manually rendering tab contents (RomeroMsk)
 - Enh: `Console::confirm()` now uses `Console::stdout()` instead of `echo` to be consistent with all other functions (cebe)
 - Chg #3630: `yii\db\Command::queryInternal()` is now protected (samdark) 
 
diff --git a/framework/db/Query.php b/framework/db/Query.php
index 39440d7d9e..f5d2ab2f8a 100644
--- a/framework/db/Query.php
+++ b/framework/db/Query.php
@@ -393,6 +393,9 @@ class Query extends Component implements QueryInterface
      * When the columns are specified as an array, you may also use array keys as the column aliases (if a column
      * does not need alias, do not use a string key).
      *
+     * Starting from version 2.0.1, you may also select sub-queries as columns by specifying each such column
+     * as a `Query` instance representing the sub-query.
+     *
      * @param string $option additional option that should be appended to the 'SELECT' keyword. For example,
      * in MySQL, the option 'SQL_CALC_FOUND_ROWS' can be used.
      * @return static the query object itself