Merge branch 'ph/rebase-original' into next