Merge branch 'ph/rebase-i-redo' into maint