Merge "Fix issues in NSMF terminate flow"