More test SpaceMgr
Merge origin/master