Merge "seperate NS heal\scale\operation for occs"