Merge branch 'jk/rebase-quiet-noop'