Merge "fix NS update error" into casablanca