Merge 1.21.11 support from upstream #1

Merged
NotAlexNoyle merged 3 commits from v2 into v2 2026-03-25 03:06:28 -04:00