fixes: #2252
Metadata Update from @julian8628: - Pull-request tagged with: testing-ready
:thumbsup:
rebased onto 3cf23467a52ef2ce1ca96cd5139fe616bd42266e
Metadata Update from @jcupova: - Pull-request tagged with: testing-done
Commit c4f30abd fixes this pull-request
Pull-Request has been merged by tkopecek
fixes: #2252