Merge "fix NS update error"