Merge branch 'jk/rebase-i-squash-count-fix'