Merge "Ensure only one approved NAS" into sc-dev