Merge branch 'ew/rebase' into next