diff --git a/changes/ticket31625 b/changes/ticket31625
new file mode 100644
index 0000000000..822a921e4f
--- /dev/null
+++ b/changes/ticket31625
@@ -0,0 +1,4 @@
+  o Code simplification and refactoring:
+    - Replace our ad-hoc set of flags for configuration variables and
+      configuration variable types with fine-grained orthogonal flags
+      corresponding to the actual behavior we want. Closes ticket 31625.