Reconcile dev
after merge to main
for v1.47.0
#5209
Merged
dev
after merge to main
for v1.47.0
#5209