Merge branch 'se/diff' into next