Related: #549
:thumbsup:
rebased onto b744195c146d30730bc87bd4b133962bd2634326
Commit 4f4b7fb5 fixes this pull-request
Pull-Request has been merged by mikem@redhat.com
Related: #549