Merge "Fix bug for ns inst"