Merge "add NS update for occs"