Merge branch 'sn/diff-doc' into next