Fix for #397
Merge pull request #399 from phxdatasec/feat-globalResetOption

Fix for #397