Backport for gh-30330, gh-30332, gh-30265#3

Merged

cesarhernandezgt merged 3 commits intotomitribe:v.4.3.30.RELEASE-TT.xfrom cesarhernandezgt:v.4.3.30.RELEASE-TT.x-patch

Apr 21, 2023

+156-26

Commits on Apr 21, 2023