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