Merge "NAS API Change" into sc-dev