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