Merge "Add user control to turn on/off nsd"