Merge branch 'sb/diff-cleanup' into maint