Manual CVE backport

[b4sjoo]

Description

This is a manual backport for #1005

Check List

• New functionality includes testing.
  • All tests pass
• New functionality has been documented.
  • New functionality has javadoc added
• Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

[codecov]

Codecov Report

Merging #1008 (9a96b3c) into 2.x (466d575) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##                2.x    #1008   +/-   ##
=========================================
  Coverage     82.32%   82.32%           
  Complexity     1918     1918           
=========================================
  Files           149      149           
  Lines          7506     7506           
  Branches        750      750           
=========================================
  Hits           6179     6179           
  Misses          987      987           
  Partials        340      340           

Flag	Coverage Δ
ml-commons	82.32% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.