Fixes #4187
:thumbsup:
rebased onto 2fd610075ec29b4b497fa478e5b9d021c7414a3c
Pull-Request has been merged by pingou
Fixes #4187