Sync v3.0.1
in the main
with the release branch
#13008
Closed
v3.0.1
in the main
with the release branch
#13008