Merge "NSB fixes: docstring, whitespace, etc."