Fixes #4093
rebased onto 1e4507b6df775deef1a826b875a5d36149686343
:thumbsup:
rebased onto f90c1c1f9803a13dc6f544f2baa83ff77799d91e
Pull-Request has been merged by pingou
Fixes #4093