Merge tag 'v9.16.49' into bind-9.16

diff --cc CHANGES
index e1e7e7e2686b60b9af5fccf2a060a29b3c2eafeb,c002eb91c666b9555d6674a4e2e1b9d41e1ec58f..e5da479cd37ca232603c0ed27cb4df55fe65ff3f
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,3 -1,5 +1,9 @@@
++6338. [func]          Optimize slabheader placement, so the infrastructure
++                      records are put in the beginning of the slabheader
++                      linked list. [GL !8675]
++
+       --- 9.16.49 released ---
+ 
  6356. [bug]           Create the pruning task in the dns_cache_flush(), so
                        the cache pruning still works after the flush.
                        [GL #4621]

diff --cc doc/arm/notes.rst
index 00c2360f83ae26d4dd978d69151e540107c4e863,620271a41c239a6b5e803ba36a0b941d97c3f42f..c6baca344d6cf279169e6c34e72f78eebb15b725
--- 1/doc/arm/notes.rst
--- 2/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@@ -46,7 -46,7 +46,8 @@@ for Microsoft Windows operating systems
  
  .. include:: ../notes/notes-known-issues.rst
  
 +.. include:: ../notes/notes-current.rst
+ .. include:: ../notes/notes-9.16.49.rst
  .. include:: ../notes/notes-9.16.48.rst
  .. include:: ../notes/notes-9.16.47.rst
  .. include:: ../notes/notes-9.16.46.rst

diff --cc lib/dns/rbtdb.c
Simple merge