Merge branch 'sf/diff'