Originally merged via #4933 (2026-04-23) but silently dropped from main, likely a rebase conflict in a later PR.