Securityfix

Merged Shane Hutchins requested to merge securityfix into dev

test potential fix

Merge request reports