Merge branch 'sb/diff-cleanup'