diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 4320dc1ac0..15fe36806f 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -74,7 +74,7 @@ Yii Framework 2 Change Log
 - Enh #12623: Added `yii\helpers\StringHelper::matchWildcard()` replacing usage of `fnmatch()`, which may be unreliable (klimov-paul)
 - Enh #13019: Support JSON in SchemaBuilderTrait (zhukovra, undefinedor)
 - Enh #13465: Added `yii\helpers\FileHelper::findDirectories()` method (ArsSirek, developeruz)
-- Enh #13618: Active record now resets related models after corresponding attributes updates (Kolyunya, rob006)
+- Enh #13618: Active Record now resets related models after corresponding attributes updates (Kolyunya, rob006)
 - Enh #13679: Added `yii\behaviors\CacheableWidgetBehavior` (Kolyunya)
 - Enh #13814: MySQL unique index names can now contain spaces (df2)
 - Enh #13879: Added upsert support for `yii\db\QueryBuilder`, `yii\db\Command`, and `yii\db\Migration` (sergeymakinen)
@@ -105,7 +105,7 @@ Yii Framework 2 Change Log
 - Enh #15347: Add `Instance` support for object property in DI container (kojit2009)
 - Enh #15357: Added multi statement support for `yii\db\sqlite\Command` (sergeymakinen)
 - Enh #15360: Refactored `BaseConsole::updateProgress()` (developeruz)
-- Enh #15398: Extract cache-related methods from `yii\db\Command` to `yii\db\CacheableQueryTrait` and use it in `yii\db\Query` (hubeiwei, silverfire)
+- Enh #15398: Added `yii\db\Query::cache()` (hubeiwei, silverfire)
 - Enh #15415: Added transaction/retry support for `yii\db\Command` (sergeymakinen)
 - Enh #15417: Added `yii\validators\FileValidator::$minFiles` (vladis84)
 - Enh #15422: Added default roles dynamic definition support via closure for `yii\rbac\BaseManager` (deltacube)
@@ -904,13 +904,13 @@ Yii Framework 2 Change Log
 - Bug #8684: Formatter ignored explicit decimal number settings when a default value is configured (leandrogehlen, cebe)
 - Bug #8772: `yii\db\ActiveQuery` failed removing duplicate records after join when the resultset did not contain the pk values e.g. after grouping (cebe)
 - Bug #8844: Added a workaround for an oracle bug when fetching information about table constraints and filtering by `CONSTRAINT_TYPE` (nidgetgod)
-- Bug #8900: Fixed determining active menu item with url-alias in route `yii\widgets\Menu::isItemActive()` (demi)
+- Bug #8900: Fixed determining active menu item with URL-alias in route `yii\widgets\Menu::isItemActive()` (demi)
 - Bug #9006: Fixed bit column always returning true using certain version of PDO MySQL (stratoss, RusAlex, mj4444ru, samdark)
 - Bug #9046: Fixed problem with endless error loop when an error occurred after sending a stream or file download response to the user (cebe)
 - Bug #9059: Fixed PHP Notice in error handler view (dynasource, andrewnester, samdark)
 - Bug #9063: Workaround for MySQL losing table case when adding index (sebathi)
 - Bug #9076: Fixed `yii\filters\PageCache` not using the configured duration and dependency when caching the response data (kidol)
-- Bug #9091: `yii\web\UrlManager::createUrl()` did not create correct url when defaults were used, internal cache is now skipped in certain situations (cebe)
+- Bug #9091: `yii\web\UrlManager::createUrl()` did not create correct URL when defaults were used, internal cache is now skipped in certain situations (cebe)
 - Bug #9127, #9128: Fixed MSSQL `yii\helpers\mssql\QueryBuilder::renameColumn()` and `yii\helpers\mssql\QueryBuilder::renameTable()` escaping (sitawit)
 - Bug #9161: Fixed `yii\web\Request` ignore `queryParams` when resolve request (zetamen)
 - Bug: Fixed string comparison in `yii\db\BaseActiveRecord::unlink()` which may result in wrong comparison result for hash valued primary keys starting with `0e` (cebe)
@@ -981,7 +981,7 @@ Yii Framework 2 Change Log
 - Bug #7867: Fixed `findUniqueIndexes()` not to perform any processing on unique index on function for pgsql (nineinchnick)
 - Bug #7868: Fixed fetching columns definition and composite foreign keys for oci (nineinchnick)
 - Bug #7868: Removed column's autoIncrement detection from oci (nineinchnick)
-- Bug #7868: Fixed creating raw sql (for logging) by skipping object and resource params (nineinchnick)
+- Bug #7868: Fixed creating raw SQL (for logging) by skipping object and resource params (nineinchnick)
 - Bug #7868: Fixed `yii\db\Schema::getLastInsertID()`` by quoting sequence name (nineinchnick)
 - Bug #7957: Removed extra `parseFloat()` call for the `compare` js validator (CthulhuDen)
 - Bug #8012: Fixed fetching multiple relations between two tables for pgsql (nineinchnick)
@@ -1195,7 +1195,7 @@ Yii Framework 2 Change Log
 - Bug #6632: `yii\di\Container::get()` did not handle config parameter correctly when it is passed as a constructor parameter (qiangxue)
 - Bug #6648: Added explicit type casting to avoid dblib issues on SQL Server 2014 (o-rey)
 - Bug #6691: Fixed console help description parsing with UTF8 characters (cebe)
-- Bug #6717: Fixed issue with UrlManager not matching a route on url creation when it was prefixed with `/` and pattern was empty (cebe)
+- Bug #6717: Fixed issue with UrlManager not matching a route on URL creation when it was prefixed with `/` and pattern was empty (cebe)
 - Bug #6736: Removed `Content-Transfer-Encoding` from the list of default download headers (DaSourcerer)
 - Enh #4502: Added alias support to URL route when calling `yii\helpers\Url::toRoute()` and `yii\helpers\Url::to()` (qiangxue, lynicidn)
 - Enh #5194: `yii\console\controllers\AssetController` now handles bundle files from external resources properly (klimov-paul)
@@ -1506,7 +1506,7 @@ Yii Framework 2 Change Log
 - Bug #3567: Fixed the bug that smallint was treated as string for PostgreSQL (qiangxue)
 - Bug #3568: When the primary query sets `asArray`, it is not respected by the `via` relational query (qiangxue)
 - Bug #3578: Fixed postgreSQL column type detection, added missing types (MDMunir, cebe)
-- Bug #3583: Added typecast to auto value of primary key on insert of sql active record (cebe)
+- Bug #3583: Added typecast to auto value of primary key on insert of SQL Active Record (cebe)
 - Bug #3591: Fixed incomplete obsolete filling in i18n `MessageController::saveMessagesToDb()` (advsm)
 - Bug #3601: Fixed the bug that the refresh URL was not generated correctly by `Captcha` (qiangxue, klevron)
 - Bug #3638: `yii\filters\HttpCache` does not work as expected when session is started before the filter (qiangxue)
@@ -1614,7 +1614,7 @@ Yii Framework 2 Change Log
 - Enh #3459: Added logging of errors, which may occur at `yii\caching\FileCache::gc()` (klimov-paul)
 - Enh #3472: Added configurable option to encode spaces in dropDownLists and listBoxes (kartik-v)
 - Enh #3518: `yii\helpers\Html::encode()` now replaces invalid code sequences with "�" (DaSourcerer)
-- Enh #3520: Added `unlinkAll()` method to active record to remove all records of a model relation (NmDimas, samdark, cebe)
+- Enh #3520: Added `unlinkAll()` method to Active Record to remove all records of a model relation (NmDimas, samdark, cebe)
 - Enh #3521: Added `yii\filters\HttpCache::sessionCacheLimiter` (qiangxue)
 - Enh #3542: Removed requirement to specify `extensions` in application config (samdark)
 - Enh #3562: Adding rotateByCopy to `yii\log\FileTarget` (pawzar)
@@ -1668,7 +1668,7 @@ Yii Framework 2 Change Log
 - Enh #4485: Added support for deferred validation in `yii\widgets\ActiveForm` (Alex-Code)
 - Enh #4520: Added sasl support to `yii\caching\MemCache` (xjflyttp)
 - Enh #4566: Added client validation support for image validator (Skysplit, qiangxue)
-- Enh #4581: Added ability to disable url encoding in `yii\web\UrlRule` (tadaszelvys)
+- Enh #4581: Added ability to disable URL encoding in `yii\web\UrlRule` (tadaszelvys)
 - Enh #4602: Added $key param in `yii\grid\ActionColumn` buttons Closure call (disem)
 - Enh #4607: AR model will throw an exception if it does not have a primary key to avoid updating/deleting data massively (qiangxue)
 - Enh #4630: Added automatic generating of unique slug value to `yii\behaviors\Sluggable` (klimov-paul)
@@ -1781,7 +1781,7 @@ Yii Framework 2 Change Log
 - Bug #1500: Log messages exported to files are not separated by newlines (omnilight, qiangxue)
 - Bug #1504: Debug toolbar isn't loaded successfully in some environments when xdebug is enabled (qiangxue)
 - Bug #1509: The SQL for creating Postgres RBAC tables is incorrect (qiangxue)
-- Bug #1545: It was not possible to execute db Query twice, params where missing (cebe)
+- Bug #1545: It was not possible to execute DB Query twice, params where missing (cebe)
 - Bug #1550: fixed the issue that JUI input widgets did not property input IDs.
 - Bug #1654: Fixed the issue that a new message source object is generated for every new message being translated (qiangxue)
 - Bug #1582: Error messages shown via client-side validation should not be double encoded (qiangxue)
@@ -1798,7 +1798,7 @@ Yii Framework 2 Change Log
 - Bug #1812: Hide potential warning message due to race condition occurring to `Session::regenerateID()` call (qiangxue)
 - Bug #1827: Debugger toolbar is loaded twice if an action is calling `run()` to execute another action (qiangxue)
 - Bug #1868: Added ability to exclude tables from `yii\console\controllers\FixtureController` apply/clear actions. (Ragazzo)
-- Bug #1869: Fixed tables clearing. `TRUNCATE` changed to `DELETE` to avoid postgresql tables checks (and truncating all tables) (Ragazzo)
+- Bug #1869: Fixed tables clearing. `TRUNCATE` changed to `DELETE` to avoid PostgreSQL tables checks (and truncating all tables) (Ragazzo)
 - Bug #1870: Validation errors weren't properly translated when using clientside validation (samdark)
 - Bug #1930: Fixed domain based URL matching for website root (samdark)
 - Bug #1937: Fixed wrong behavior or advanced app's `init --env` when called without parameter actually specified (samdark)
@@ -1871,13 +1871,13 @@ Yii Framework 2 Change Log
 - Enh #1572: Added `yii\web\Controller::createAbsoluteUrl()` (samdark)
 - Enh #1579: throw exception when the given AR relation name does not match in a case sensitive manner (qiangxue)
 - Enh #1581: Added `yii\db\ActiveQuery::joinWith()` and `yii\db\ActiveQuery::innerJoinWith()` to support joining with relations (qiangxue)
-- Enh #1585: added schema parameter to `createAbsoluteUrl()`` to force 'http' or 'https' (cebe)
+- Enh #1585: added schema parameter to `createAbsoluteUrl()` to force 'http' or 'https' (cebe)
 - Enh #1601: Added support for tagName and encodeLabel parameters in ButtonDropdown (omnilight)
 - Enh #1611: Added `yii\db\BaseActiveRecord::markAttributeDirty()` (qiangxue)
 - Enh #1633: Advanced project template now works with MongoDB by default (samdark)
 - Enh #1634: Use masked CSRF tokens to prevent BREACH exploits (qiangxue)
 - Enh #1641: Added `BaseActiveRecord::updateAttributes()` (qiangxue)
-- Enh #1646: Added postgresql `yii\db\QueryBuilder::checkIntegrity()` and `yii\db\QueryBuilder::resetSequence()` (Ragazzo)
+- Enh #1646: Added PostgreSQL `yii\db\QueryBuilder::checkIntegrity()` and `yii\db\QueryBuilder::resetSequence()` (Ragazzo)
 - Enh #1645: Added `yii\db\Connection::$pdoClass` property (Ragazzo)
 - Enh #1645: Added support for nested DB transactions (qiangxue)
 - Enh #1681: Added support for automatically adjusting the "for" attribute of label generated by `yii\widgets\ActiveField::label()` (qiangxue)
@@ -1906,7 +1906,7 @@ Yii Framework 2 Change Log
 - Enh #2102: `yii\widgets\DetailView` now allow use custom label in string format like `name:format:label` (creocoder)
 - Enh #2103: Renamed `yii\web\AccessDeniedHttpException` to `yii\web\ForbiddenHttpException`, added new commonly used HTTP exception classes (danschmidt5189)
 - Enh #2124: Added support for UNION ALL queries (Ivan Pomortsev, iworker)
-- Enh #2132: Allow url of CSS and JS files registered in yii\web\View to be url alias (cebe)
+- Enh #2132: Allow URL of CSS and JS files registered in yii\web\View to be URL alias (cebe)
 - Enh #2144: `Html` helper now supports rendering "data" attributes (qiangxue)
 - Enh #2156: `yii migrate` now automatically creates `migrations` directory if it does not exist (samdark)
 - Enh #2211: Added typecast database types into php types (dizews)
@@ -1997,7 +1997,7 @@ Yii Framework 2 Change Log
 - Chg #2161: Added ability to use `return` in `Widget::run` (samdark)
 - Chg #2173: Removed `yii\helpers\StringHelper::diff()`, Moved `phpspec/php-diff` dependency from `yiisoft/yii2` to `yiisoft/yii2-gii` (samdark)
 - Chg #2175: `yii\db\QueryBuilder` will now append UNION statements at the end of the primary SQL (qiangxue)
-- Chg #2210: Mysql driver will now treat `tinyint(1)` as integer instead of boolean (qiangxue)
+- Chg #2210: MySQL driver will now treat `tinyint(1)` as integer instead of boolean (qiangxue)
 - Chg #2248: Renamed `yii\base\Model::DEFAULT_SCENARIO` to `yii\base\Model::SCENARIO_DEFAULT` (samdark)
 - Chg #2281: Renamed `yii\db\ActiveRecord::create()` to `populateRecord()` and changed signature. This method will not call instantiate() anymore (cebe)
 - Chg #2405: The CSS class of `yii\widgets\MaskedInput` now defaults to `form-control` (qiangxue)