on new branch
Two API additions
Merge branch 'abranch' of https://github.com/jiang-ts/ncssmsgdev