Merge branch 'sni'