diff --git a/changelog.d/8423.misc b/changelog.d/8423.misc
new file mode 100644
index 000000000000..7260e3fa4182
--- /dev/null
+++ b/changelog.d/8423.misc
@@ -0,0 +1 @@
+Various refactors to simplify stream token handling.