Reconcile dev
after merge to main
for v1.43.2
#4912
Merged
dev
after merge to main
for v1.43.2
#4912