Moved ns comment to docstring.
Merge branch 'dev' into api-unit-testing