Merge pull request #9522 from sandreenko/GVM-for-corert