Merge branch '4.0.x'

Closes gh-50442
This commit is contained in:
Andy Wilkinson
2026-05-14 15:09:03 +01:00