Device namespace patches - initial commit