JIRA: RHELWF-2180
rebased onto 77973d9bcc4a17a2e0a154916b63f565fa2e0752
Pull-Request has been merged by jskladan
JIRA: RHELWF-2180