Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint