Merge "Add DEPTH variables into ADataSpace"