Sync v3.1
release branch with main
#13048
Merged
v3.1
release branch with main
#13048