Backport gh-2066#2069

Merged

antonwolfy merged 2 commits intomaintenance/0.16.xfrom

backport-gh-2066

Sep 20, 2024

Commits on Sep 19, 2024

Resolve compilation failure in debug build (#2066)

authored and
Vahid Tavanashad
committed

Commits on Sep 20, 2024

Merge branch 'maintenance/0.16.x' into backport-gh-2066
antonwolfy
authored