diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e0f67b7aa2..29a5cd49fbc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,22 +7,15 @@ Ansible Changes By Release
 
 ### Major Changes
 * Removed the previously deprecated 'accelerate' mode and all associated keywords and code.
-* Removed the previously deprecated 'accelerate' mode and all associated keywords and code.
 * New simpler and more intuitive 'loop' keyword for task loops
+* Added fact namespacing, from now on facts will be available under `ansible_facts` namespace (i.e. `ansible_facts.os_distribution`) w/o the `ansilbe_` prefix.
+  They will continue to be added into the main namespace directly, but now with a configuration toggle to enable this,
+  currently on by default, in the future it will be off.
 
 ### Deprecations
 * Previously deprecated 'hostfile' config settings have been 're-deprecated' as previously code did not warn about deprecated configuration settings.
 * The ``with_<lookup>`` loops are deprecated in favor of the new ``loop`` keyword
 
-#### Deprecated Modules (to be removed in 2.9):
-* ec2_ami_find
-
-#### Removed Modules (previously deprecated):
-* accelerate
-* boundary_meter: There was no deprecation period for this but the hosted
-  service it relied on has gone away so the module has been removed.
-  https://github.com/ansible/ansible/issues/29387
-
 ### Minor Changes
 * added a few new magic vars corresponding to configuration/command line options:
   `ansible_diff_mode`, `ansible_inventory_sources`, `ansible_limit`, `ansible_run_tags` , `ansible_forks` and `ansible_skip_tags`
@@ -33,16 +26,27 @@ Ansible Changes By Release
 * The jenkins_plugin and yum_repository plugins had their `params` option
   removed due to circumventing Ansible's option processing.
 
+#### Deprecated Modules (to be removed in 2.9):
+* ec2_ami_find
+
+#### Removed Modules (previously deprecated):
+* accelerate
+* boundary_meter: There was no deprecation period for this but the hosted
+  service it relied on has gone away so the module has been removed.
+  https://github.com/ansible/ansible/issues/29387
+
 ### New Plugins
 
 ## Lookups
-* Added `aws_ssm` lookup plugin
-* config, allows querying Ansible settings
+* aws_ssm: Query AWS ssm data
+* config: Lookup Ansible settings
+* openshift: Return info from Openshift installation
+
+## Callbacks
+* yaml
 
 ### New Modules
 
-* Added `yaml` output plugin
-
 #### Cloud
 
   * aws_ssm_parameter_store
diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py
index c6255d5c67d..bfb721b3e62 100644
--- a/lib/ansible/constants.py
+++ b/lib/ansible/constants.py
@@ -100,6 +100,11 @@ VAULT_VERSION_MIN = 1.0
 VAULT_VERSION_MAX = 1.0
 
 # FIXME: remove once play_context mangling is removed
+# the magic variable mapping dictionary below is used to translate
+# host/inventory variables to fields in the PlayContext
+# object. The dictionary values are tuples, to account for aliases
+# in variable names.
+
 MAGIC_VARIABLE_MAPPING = dict(
 
     # base
diff --git a/lib/ansible/playbook/play_context.py b/lib/ansible/playbook/play_context.py
index 4f0f86afc8a..addb037dbd4 100644
--- a/lib/ansible/playbook/play_context.py
+++ b/lib/ansible/playbook/play_context.py
@@ -49,11 +49,6 @@ except ImportError:
 
 __all__ = ['PlayContext']
 
-# the magic variable mapping dictionary below is used to translate
-# host/inventory variables to fields in the PlayContext
-# object. The dictionary values are tuples, to account for aliases
-# in variable names.
-
 
 # TODO: needs to be configurable
 b_SU_PROMPT_LOCALIZATIONS = [