Merge branch 'se/rebase' into next