diff --git a/core/CHANGELOG.txt b/core/CHANGELOG.txt
index b1d83aaedc..1ef9b96955 100644
--- a/core/CHANGELOG.txt
+++ b/core/CHANGELOG.txt
@@ -128,6 +128,7 @@ system](https://www.drupal.org/node/2821423) is underway.
   to purge them any more. [Empty field deletion is now performed
   immediately](https://www.drupal.org/node/2884202) instead to avoid this
   scenario.
+* @todo [Clearing cache via UI in translated language resets config translation of field labels to default language](https://www.drupal.org/node/2650434)
 
 ### New stable modules
 
@@ -170,16 +171,18 @@ these modules. Developers and expert site builders can now add Media as a
 dependency. Work is underway to [provide an update path for existing sites'
 Media Entity data](https://www.drupal.org/node/2880334) and to [port existing
 contributed modules to the improved core
-API](https://www.drupal.org/node/2860796).
+API](https://www.drupal.org/node/2860796). Both versions cannot be used at the
+same time, so we also [prevent the 1.x version of the contributed Media Entity
+module from being enabled at the same time as the core Media
+module](https://www.drupal.org/node/2896427).
 
 Note that **the core Media module is currently marked hidden** and will not
 appear on the 'Extend' (module administration) page. (Enabling a contributed
 module that depends on the core Media module will also enable Media
 automatically.) The module will be displayed to site builders normally once
-user experience issues with it are resolved in a future release.
-
-Similarly, the REST API and normalizations for Media is not final and support
-for decoupled applications will be improved in a future release.
+user experience issues with it are resolved. Similarly, the REST API and
+normalizations for Media is not final and support for decoupled applications
+will also be improved in a future release.
 
 #### Inline Form Errors
 
@@ -350,6 +353,7 @@ either Content Moderation and/or some other module that requires it.
   be thrown. [See the change record for information about how to update
   `phpunit.xml` and how to test deprecated
   code](https://www.drupal.org/node/2811561).
+* @todo [Break BrowserTestBase & children dependency on Simpletest, deprecate stub BC traits](https://www.drupal.org/node/2803621)
 * [Resolved random test failures](https://www.drupal.org/node/2866056) due to
   ResourceTestBase's HTTP client timeout of 30 seconds.
 
@@ -380,6 +384,8 @@ either Content Moderation and/or some other module that requires it.
 * [CKEditor has been updated from 4.6.2 to 4.7.2](https://www.drupal.org/node/2904142).
 * [asm89/stack-cors has been updated from 1.0 to 1.1](https://www.drupal.org/node/2853201).
 * [The minimum phpsec/prophecy requirement is now 1.4](https://www.drupal.org/node/2900800).
+* @todo [Update non-Symfony dependencies in lock file before 8.4.0](https://www.drupal.org/node/2900112)
+* @todo [Again update non-Symfony dependencies in lock file before 8.4.0](https://www.drupal.org/node/2909743)
 
 ### Experimental modules
 
@@ -458,6 +464,10 @@ stable in time for 8.4.0! Notable improvements in this release:
   ["forward revisions" has been replaced with that of "pending revisions"](https://www.drupal.org/node/2890364).
   If your contributed module refers to revisions that are not yet published, it
   should use this new term.
+* @todo [BaseFieldOverride entities created by content_translation break content_moderation because they don't support computed fields](https://www.drupal.org/node/2848775)
+* @todo [Rewrite the 'Latest revision' views filter and remove the revision_tracker table](https://www.drupal.org/node/2865579)
+* @todo [Provide the 'revision_translation_affected' base field by default for all revisionable and translatable entity types](https://www.drupal.org/node/2896845)
+
 
 As per the experimental module process, there were some backwards-incompatible
 changes since Drupal 8.3.x. Experimental modules do not offer a supported
@@ -478,34 +488,18 @@ in Drupal core.
 
 The Settings Tray module allows configuring page elements such as blocks and
 menus from the frontend of your site. Settings Tray has improved significantly
-since Drupal 8.3.0. The module reached beta stability following completion of
-[moving the off-canvas dialog renderer into a core
+since Drupal 8.3.0, including numerous user interaction and accessibility
+fixes, better compatibility with stable core modules like Quick Edit and
+Contextual Links, added documentation, and [a CSS
+reset](https://www.drupal.org/node/2826722) for better themer experience.
+
+The module reached beta stability following completion of [moving the
+off-canvas dialog renderer into a core
 component](https://www.drupal.org/node/2784443), and [renaming the machine name
 of the module to settings_tray](https://www.drupal.org/node/2803375), to match
 its user-facing name. We hope to make Settings Tray stable by 8.5.0. To track
 progress, see the ["outside in" roadmap issue](https://www.drupal.org/node/2762505).
 
-* [A CSS reset has been added](https://www.drupal.org/node/2826722) to improve
-  the themer experience.
-* Form validation messages now [appear in the Settings Tray instead of main
-  page](https://www.drupal.org/node/2785047).
-* [The toolbar background in Edit mode now matches the edit
-  button](https://www.drupal.org/node/2894427), instead of the white background
-  that many users found distracting or  misunderstood to be an indication that
-  something was broken.
-* The block title field in the tray is now [labeled more clearly and only shown
-  when the block title itself is shown](https://www.drupal.org/node/2882729).
-* In the contextual links, ["Quick edit" is now listed before
- "Configure"](https://www.drupal.org/node/2784567), and the [custom blocks
-  instead have a "Quick edit settings"
-  link](https://www.drupal.org/node/2786193) (to distinguish them from the
-  links provided by the Quick Edit module, which allow editing the content of
-  the custom block itself).
-* Edit mode [now behaves the same way whether accessed by clicking "Quick edit"
-  or clicking through the toolbar](https://www.drupal.org/node/2847664).
-* Users can now [escape from Edit mode with the ESC
-  key](https://www.drupal.org/node/2784571), for better accessibility.
-
 #### Place Blocks ([alpha stability](https://www.drupal.org/core/experimental#alpha))
 
 This feature allows the user to place a block on any page and see the region
