Synchronize the enterprise version to reduce conflicts

[panda-sheep]

What type of PR is this?

• bug
• feature
• enhancement

What does this PR do?

Because this feature has been modified in the enterprise version, in order to avoid a large number of conflicts with the enterprise version, it is synchronized in the community version.

Which issue(s)/PR(s) this PR relates to?

Special notes for your reviewer, ex. impact of this fix, etc:

Additional context/ Design document:

Checklist:

• Documentation affected (Please add the label if documentation needs to be modified.)
• Incompatibility (If it breaks the compatibility, please describe it and add the corresponding label.）
• If it's needed to cherry-pick (If cherry-pick to some branches is required, please label the destination version(s).)
• Performance impacted: Consumes more CPU/Memory

Release notes:

Please confirm whether to be reflected in release notes and how to describe:

                                                            `