fix the bugs of namespaces
Merge remote-tracking branch 'origin/master'