Merge "API changes for NAS"