Moved from kernel, updated namespaces
Merge remote-tracking branch 'origin/master'