Reconcile dev
after merge to main
for v1.54.0
#5986
Merged
dev
after merge to main
for v1.54.0
#5986