Merge branch 'nd/maint-diffstat-summary' into maint