#4204 fix-4166

Merged
zouap merged 3 commits from fix-4166 into V20230531 11 months ago