Securityfix

Merged Shane Hutchins requested to merge securityfix into dev

Merge request reports