Merge branch 'work.namespace' into for-linus