Merge "Handle shcema without namespace."