Merge branch 'netdev-doc-defaq'