Fix root namespace
Merge branch 'devel'