Merge "Fix DataSpaceTest cts issue."