Merge pull request #494 from micmac1/fs-vpx-cve-1806