JIRA: RHELWF-4111
rebased onto 3a26fedd63fb74b909f6ef04f10d965d38aba0c3
Merging. Reviewed by the requester.
Pull-Request has been merged by lholecek
JIRA: RHELWF-4111