Data space stack support related fixes.
Merge branch 'master' into dev-00.013.000