Merge "Remove isDataspaceValid" into sc-dev