cherry pick pr1106 to Release 1.0

[fewdan]

What problem does this PR solve?

cherry pick pr1106 to Release 1.0

What is changed and how does it work?

Checklist

Tests

• Unit test
• E2E test
• Manual test (add detailed scripts or steps below)
• No code

Side effects

• Breaking backward compatibility

Related changes

• Need to update the documentation

Does this PR introduce a user-facing change?

NONE

[codecov-io]

Codecov Report

❗ No coverage uploaded for pull request base (release-1.0@1ed0b03). Click here to learn what that means.
The diff coverage is n/a.

@@              Coverage Diff               @@
##             release-1.0    #1119   +/-   ##
==============================================
  Coverage               ?   48.32%           
==============================================
  Files                  ?       72           
  Lines                  ?     4360           
  Branches               ?        0           
==============================================
  Hits                   ?     2107           
  Misses                 ?     2045           
  Partials               ?      208           

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1ed0b03...20dbac6. Read the comment docs.