Merge pull request #12723 from Vexu/stage2-fixes

Stage2 fixes
b7d5582dedVeikka Tuominen committed on 9/3/2022, 12:48:28 PM· committed by GitHubparents10e11b6c7884af
35 files changedLine totals unavailable