Merge branch '3.5.x' into 4.0.x

Closes gh-50441
This commit is contained in:
Andy Wilkinson
2026-05-14 15:08:49 +01:00