adding test for CVE
Merge branch '3-1-later' into 3-1-stable

* 3-1-later:
  adding test for CVE