Resolve "Line numbers are off in dynamically loaded diff chunks" Closes #26300 See merge request !8428
