backport PR 15979 to 1.15.x#17208

Merged

malizz merged 6 commits intorelease/1.15.xfrom

malizz/NET-1646/backport-pr-15979

May 10, 2023

Commits on May 9, 2023

backport PR 15979 to 1.15.x
Maliz
committed
fix test file
Maliz
committed
fix proto generated file
Maliz
committed
update unit tests
Maliz
committed
fix merge conflict
Maliz
committed
fix test
Maliz
committed