Merge branch 'se/diff'