Better NFD config/bcf boundary
Merge branch 'dev' into ms