add nfbird namspace
Merge branch 'hotfix/ns'