Addresses https://bugzilla.redhat.com/show_bug.cgi?id=1748876
rebased onto d6fd3f08a5940b4902917e09f3690d49555e24e5
Pull-Request has been merged by sgallagh
Addresses https://bugzilla.redhat.com/show_bug.cgi?id=1748876