Reconcile dev
after merge to main
for v1.48.1
#5395
Merged
dev
after merge to main
for v1.48.1
#5395