Remove namespace
Refactor
Refactor
Merge branch 'master' into builds
7.915