Related: https://pagure.io/koji/issue/3420
rebased onto 214b2c1459e0624ec677ef4644776731c294a3f3
rebased onto f5d4f41e33d17c1d9129d6f913b2f23343dcf202
rebased onto 48b94dadf842373d8216fb8a99a3846fb029d0fe
Commit 234cefdf fixes this pull-request
Pull-Request has been merged by tkopecek
Related: https://pagure.io/koji/issue/3420