Fixes #4573
:thumbsup:
rebased onto 2f41e0302a6af004fb4968f158ea5851f78f8dc3
rebased onto d477d22aa82f41873ba856f16784922420428957
Pull-Request has been merged by pingou
Fixes #4573