Merge "Stop providing duplicate info to NAS"