Merge branch 'vr/rebase-autosquash-does-not-imply-i'