Squashed 'ns/' content from commit 32f7cf7

git-subtree-dir: ns
git-subtree-split: 32f7cf7555a79c8ba75b19dc1fc83a7194ff5167
Merge commit '6783a98278405ff6ad6354f5adfddb9e42097cd2' as 'ns'