diff --git a/changelog.d/3570.bugfix b/changelog.d/3570.bugfix
new file mode 100644
index 000000000..cec5158a9
--- /dev/null
+++ b/changelog.d/3570.bugfix
@@ -0,0 +1 @@
+Fix potential stack overflow and deadlock under heavy load
\ No newline at end of file
diff --git a/changelog.d/3571.misc b/changelog.d/3571.misc
new file mode 100644
index 000000000..8908324e6
--- /dev/null
+++ b/changelog.d/3571.misc
@@ -0,0 +1 @@
+Merge Linearizer and Limiter