Merge "Refactor codes for ns instances"