Merge branch 'lk/line-range-parsing-fix'