Merge branch 'jc/maint-diff-quiet' into maint