Merge branch 'ax/line-log-range-merge-fix'