Merge pull request #13585 from Vexu/stage2-fixes

Stage2 bug fixes
a3232c6764Veikka Tuominen committed on 1/9/2023, 9:35:42 PM· committed by Andrew Kelleyparent10a660e
20 files changedLine totals unavailable