Port changes from #3154 to zed2

ba189f2af1Conrad Irwin committed on 10/27/2023, 11:24:37 AMparent67ecc2f
1 file changedLine totals unavailable