Resolve merge conflict from release branch

Feilong Huangrequested to merge
resolve_merge_conflict_from_release_branch into main

Merge request reports