backport https://bugzilla.redhat.com/show_bug.cgi?id=1526510 fix to 1_07_X branch
Pull-Request has been closed by petersen
backport https://bugzilla.redhat.com/show_bug.cgi?id=1526510 fix to 1_07_X branch