[release-1.9] Backport #48751 and #48832#48881
Merged
KristofferC merged 2 commits intobackports-release-1.9from Mar 6, 2023
Merged
[release-1.9] Backport #48751 and #48832#48881KristofferC merged 2 commits intobackports-release-1.9from
KristofferC merged 2 commits intobackports-release-1.9from