vuln fixes

Merged Gokul Nagare requested to merge vuln-fixes into master

Merge request reports