Merge remote-tracking branch 'shell/namespaced' into namespaced