Alternate solution for #1609 (see also PR #1614)
:thumbsup:
Commit 0b0e38ae fixes this pull-request
Pull-Request has been merged by tkopecek
Metadata Update from @julian8628: - Pull-request tagged with: testing-ready
Metadata Update from @jcupova: - Pull-request tagged with: testing-done
Alternate solution for #1609 (see also PR #1614)