#4864 fix-4777

Merged
zouap merged 5 commits from fix-4777 into V20231102 6 months ago