Merge "Refactor codes for terminate ns"