Merge branch 'jk/rebase-quiet-noop' into maint