Recreated from #11688 (MumuTW) onto the active release/v3.8.51 — commit cherry-picked cleanly with author preserved; 9/9 focused tests + file-size all green on this tip. Thanks for the fix!