Merge branch 'kb/use-nsec-doc'