Devide one namespace into multiple ones.
Merge branch 'develop'