Reconcile dev
after merge to main
for v1.49.1
#5487
Merged
dev
after merge to main
for v1.49.1
#5487