Merge branch 'ph/pull-rebase-detached' into maint