diff --git a/.editorconfig b/.editorconfig
index 986cead47c5d..9f1cd658310a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -25,3 +25,8 @@ indent_size = 2
 [{CMakeLists.txt,*.cmake,*.rst}]
 indent_style = space
 indent_size = 2
+
+# Markdown
+[*.md]
+trim_trailing_whitespace = true
+indent_style = space
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f27eb0094aa..c0ee4f2c911d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Finalize profiler in MAPL_finalize call
 - Fix how a retry-build is done in CI
 - Fix issue with logger message and single quotes
+- Fix bug with profiler reporting in programs
 
 ### Changed
 
@@ -36,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - extracted helper procedures in GenericInitialize
 - Added new step to CircleCI to try and re-run build on failure.
 - Updated CircleCI config to use new [GEOS-ESM/circleci-tools orb](https://circleci.com/developer/orbs/orb/geos-esm/circleci-tools)
+- Added Markdown rules to `.editorconfig`
 
 ## [2.15.1] - 2022-01-06