Merge "Define a backing type for ADataSpace." into main