Merge pull request #716 from micmac1/restund-cve-21.02