Merge branch 'pw/rebase-i-squash-number-fix'