Merge branch '2.21' into 2.x

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -9,6 +9,7 @@ Versions: 2.x
 
 No changes since 2.20
 
+2.20.2 (19-Jan-2026)
 2.20.1 (30-Oct-2025)
 
 No changes since 2.20.0
@@ -25,6 +26,7 @@ No changes since 2.20.0
 
 No changes since 2.18
 
+2.18.6 (22-Feb-2026)
 2.18.5 (27-Oct-2025)
 2.18.4 (06-May-2025)