diff --git a/framework/BaseYii.php b/framework/BaseYii.php
index 94ff364fbb2..d35c14b550c 100644
--- a/framework/BaseYii.php
+++ b/framework/BaseYii.php
@@ -93,7 +93,7 @@ class BaseYii
      */
     public static function getVersion()
     {
-        return '2.0.33-dev';
+        return '2.0.33';
     }
 
     /**
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 19cbe37a600..368c6cb0a95 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -1,35 +1,36 @@
 Yii Framework 2 Change Log
 ==========================
 
-2.0.33 under development
-------------------------
+2.0.33 March 24, 2020
+---------------------
 
-- Bug #17878: Detect CORS AJAX requests without `X-Requested-With` in `Request::getIsAjax()` (dicrtarasov, samdark)
-- Enh #17929: Actions can now have bool typed params bound (alex-code)
-- Enh #17827: Add `StringValidator::$strict` that can be turned off to allow any scalars (adhayward, samdark)
-- Bug #16145: Fix `Html` helper `checkboxList()`, `radioList()`, `renderSelectOptions()`, `dropDownList()`, `listBox()` methods to work properly with traversable selection (samdark)
-- Bug #17797: Fix for `activeListInput` options (alex-code)
-- Bug #16092: Fix duplicate joins in usage of `joinWith` (germanow)
-- Bug #17679: Fix Oracle exception "ORA-01461: can bind a LONG value only for insert into a LONG column" when inserting 4k+ string (vinpel, 243083df)
-- Bug #17859: Fix loading fixtures under Windows (samdark)
 - Bug #11945: Fix Schema Builder MySQL column definition order (simialbi)
-- Bug #17886: Fix `yii\rest\Serializer` to serialize arrays (patacca)
+- Bug #13749: Fix Yii opens db connection even when hits query cache (shushenghong)
+- Bug #16092: Fix duplicate joins in usage of `joinWith` (germanow)
+- Bug #16145: Fix `Html` helper `checkboxList()`, `radioList()`, `renderSelectOptions()`, `dropDownList()`, `listBox()` methods to work properly with traversable selection (samdark)
 - Bug #16334: Add `\JsonSerializable` support to `ArrayableTrait` (germanow)
+- Bug #17667: Fix `CREATE INDEX` failure on SQLite when specifying schema (santilin, samdark)
+- Bug #17679: Fix Oracle exception "ORA-01461: can bind a LONG value only for insert into a LONG column" when inserting 4k+ string (vinpel, 243083df)
+- Bug #17797: Fix for `activeListInput` options (alex-code)
 - Bug #17798: Avoid creating directory for stream log targets in `FileTarget` (wapmorgan)
-- Bug #17850: Update to `ReplaceArrayValue` config exception message (alex-code)
-- Bug #17843: Fix `yii\web\Session::setCookieParamsInternal` checked "samesite" parameter incorrectly (schevgeny)
 - Bug #17828: Fix `yii\web\UploadedFile::saveAs()` failing when error value in `$_FILES` entry is a string (haveyaseen)
 - Bug #17829: `yii\helpers\ArrayHelper::filter` now correctly filters data when passing a filter with more than 2 levels (rhertogh)
-- Enh #7622: Allow `yii\data\ArrayDataProvider` to control the sort flags for `sortModels` through `yii\data\Sort::sortFlags` property (askobara)
-- Bug #17667: Fix `CREATE INDEX` failure on SQLite when specifying schema (santilin, samdark)
-- Enh #16721: Use `Instance::ensure()` to initialize `UrlManager::$cache` (rob006)
+- Bug #17843: Fix `yii\web\Session::setCookieParamsInternal` checked "samesite" parameter incorrectly (schevgeny)
+- Bug #17850: Update to `ReplaceArrayValue` config exception message (alex-code)
+- Bug #17859: Fix loading fixtures under Windows (samdark)
 - Bug #17863: `\yii\helpers\BaseInflector::slug()` doesn't work with an empty string as a replacement argument (haruatari)
-- Bug #17881: `yii\db\Query::queryScalar()` wasn’t reverting the `select`, `orderBy`, `limit`, and `offset` params if an exception occurred (brandonkelly)
 - Bug #17875: Use `move_uploaded_file()` function instead of `copy()` and `unlink()` for saving uploaded files in case of POST request (sup-ham)
+- Bug #17878: Detect CORS AJAX requests without `X-Requested-With` in `Request::getIsAjax()` (dicrtarasov, samdark)
+- Bug #17881: `yii\db\Query::queryScalar()` wasn’t reverting the `select`, `orderBy`, `limit`, and `offset` params if an exception occurred (brandonkelly)
 - Bug #17884: Fix 0 values in console Table rendered as empty string (mikehaertl)
-- Bug #13749: Fix Yii opens db connection even when hits query cache (shushenghong)
+- Bug #17886: Fix `yii\rest\Serializer` to serialize arrays (patacca)
 - Bug #17909: Reset DB schema, transaction, and driver name when the connection is closed (brandonkelly)
 - Bug #17920: Fix quoting for `Command::getRawSql` having `Expression` in params (alex-code)
+- Enh #7622: Allow `yii\data\ArrayDataProvider` to control the sort flags for `sortModels` through `yii\data\Sort::sortFlags` property (askobara)
+- Enh #16721: Use `Instance::ensure()` to initialize `UrlManager::$cache` (rob006)
+- Enh #17827: Add `StringValidator::$strict` that can be turned off to allow any scalars (adhayward, samdark)
+- Enh #17929: Actions can now have bool typed params bound (alex-code)
+
 
 2.0.32 January 21, 2020
 -----------------------
diff --git a/framework/classes.php b/framework/classes.php
index db918ea3ca1..622a1b74b30 100644
--- a/framework/classes.php
+++ b/framework/classes.php
@@ -187,6 +187,7 @@
   'yii\db\mysql\QueryBuilder' => YII2_PATH . '/db/mysql/QueryBuilder.php',
   'yii\db\mysql\Schema' => YII2_PATH . '/db/mysql/Schema.php',
   'yii\db\oci\ColumnSchemaBuilder' => YII2_PATH . '/db/oci/ColumnSchemaBuilder.php',
+  'yii\db\oci\Command' => YII2_PATH . '/db/oci/Command.php',
   'yii\db\oci\QueryBuilder' => YII2_PATH . '/db/oci/QueryBuilder.php',
   'yii\db\oci\Schema' => YII2_PATH . '/db/oci/Schema.php',
   'yii\db\oci\conditions\InConditionBuilder' => YII2_PATH . '/db/oci/conditions/InConditionBuilder.php',
diff --git a/framework/data/Sort.php b/framework/data/Sort.php
index b4a4c377c4a..78cc868a82e 100644
--- a/framework/data/Sort.php
+++ b/framework/data/Sort.php
@@ -185,7 +185,6 @@ class Sort extends BaseObject
      * the `urlManager` application component will be used.
      */
     public $urlManager;
-
     /**
      * @var int Allow to control a value of the fourth parameter which will be
      * passed to [[ArrayHelper::multisort()]]
@@ -193,6 +192,7 @@ class Sort extends BaseObject
      */
     public $sortFlags = SORT_REGULAR;
 
+
     /**
      * Normalizes the [[attributes]] property.
      */
diff --git a/framework/db/Command.php b/framework/db/Command.php
index 9618ea667b3..27909fa2cf4 100644
--- a/framework/db/Command.php
+++ b/framework/db/Command.php
@@ -93,6 +93,7 @@ class Command extends Component
      * @since 2.0.33
      */
     protected $pendingParams = [];
+
     /**
      * @var string the SQL statement that this command represents
      */
diff --git a/framework/validators/StringValidator.php b/framework/validators/StringValidator.php
index 195710f225c..f06dbfc2208 100644
--- a/framework/validators/StringValidator.php
+++ b/framework/validators/StringValidator.php
@@ -71,6 +71,7 @@ class StringValidator extends Validator
      */
     public $strict = true;
 
+
     /**
      * {@inheritdoc}
      */