Merge branch 'nd/diff-flush-before-warning' into maint