Fixes #2198
:thumbsup:
Metadata Update from @tkopecek: - Pull-request tagged with: testing-ready
rebased onto ecd4f391571cb8f2fa03547af54fc23115e57872
Commit b19f3527 fixes this pull-request
Pull-Request has been merged by tkopecek
Metadata Update from @jcupova: - Pull-request tagged with: testing-done
Fixes #2198