Merge branch 'jc/diff-sane-truncate-no-more' into next