Merge branch 'tg/range-diff-output-update'