update nsc v2.1
Merge nsc-branch to update nsc v2.1