Added namespace snippets
Merge branch 'release/6.7.0'