Merge branch 'sn/diff-doc'