[Backport 2.x]CVE fixes

[mohitamg]

Description

[Describe what this change achieves]
Backporting manually #1001

Issues Resolved

[List any issues this PR will resolve]

Check List

• 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

All modified and coverable lines are covered by tests ✅

Project coverage is 63.37%. Comparing base (343913c) to head (d941a27).
Report is 1 commits behind head on 2.x.

Additional details and impacted files

@@            Coverage Diff             @@
##              2.x    #1008      +/-   ##
==========================================
- Coverage   63.38%   63.37%   -0.01%     
==========================================
  Files         341      341              
  Lines       11554    11554              
  Branches     2112     2243     +131     
==========================================
- Hits         7323     7322       -1     
  Misses       3658     3658              
- Partials      573      574       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.