Merge Request - mitigation_25may

@thomas.shepherd @balexand @sean.melissari @alfontaine

Requesting that branch mitigation_25may be merged into the development branch. CVE's have been mitigated and justified within the attached justification spreadsheet. #1 (closed)