Merge branch 'rs/diff-no-minimal' into maint