Merge branch 'ph/rebase-preserve-all-merges' into maint