Merge branch 'pw/rebase-abort-clean-rewritten' into maint