Merge branch 'nd/diff-quiet-stat-dirty' into maint