Merge branch 'ss/pull-rebase-preserve' into maint