fixes: #2379 related: #2320
@mikem
rebased onto a99f10bb7861a18485ff8468a077f5a940472f3e
Metadata Update from @julian8628: - Pull-request tagged with: testing-ready
Metadata Update from @jcupova: - Pull-request tagged with: testing-done
pretty please pagure-ci rebuild
closing in favor of #2387
Pull-Request has been closed by mikem
fixes: #2379
related: #2320