Merge branch 'ld/maint-diff-quiet-w' into maint