#3596 fix-3578

Merged
zouap merged 7 commits from fix-3578 into V20230215 1 year ago