merge
Fix the bug that NameServer couldn't find Storage.