Merge "Fix NAS dialog string" into sc-dev