Merge "Fix NSWC goingAway flag"