cherry pick by hand of #5806



because cherry-pick from 1.3-dev to 1.2-fixes was not working

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>