Adding back fix from RT#67355
Merge pull request #4 from nfg/feature-restore-name-check

Adding back fix from RT#67355