Reconcile dev
after merge to main
for v1.40.0
#4652
Merged
dev
after merge to main
for v1.40.0
#4652