Securityfix

Closed Shane Hutchins requested to merge securityfix into dev

Security Update testing in dev branch

Merge request reports