Merge "Track ADataSpace naming adjustments" into main