Merge branch 'jc/maint-diff-quiet'