[Backport 2.7] Backport/backport 588 to 2.7

[mengweieric]

(cherry picked from commit a85b716)

Description

[Describe what this change achieves]

Issues Resolved

[List any issues this PR will resolve]

Check List

• New functionality includes testing.
  • All tests pass, including unit test, integration test and doctest
• New functionality has been documented.
  • New functionality has javadoc added
  • New functionality has user manual doc 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 #597 (f8eead3) into 2.7 (6ed6a5c) will decrease coverage by 0.08%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##              2.7     #597      +/-   ##
==========================================
- Coverage   42.84%   42.76%   -0.08%     
==========================================
  Files         299      294       -5     
  Lines       17801    17772      -29     
  Branches     4408     4402       -6     
==========================================
- Hits         7626     7600      -26     
+ Misses      10134     9642     -492     
- Partials       41      530     +489     

Flag	Coverage Δ
dashboards-observability	42.76% <ø> (-0.08%)	⬇️

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

see 94 files with indirect coverage changes