Merge pull request #720 from micmac1/restund-cve