JIRA: RHELWF-6331
@vmaljulin, @rlim Please review. I would like to test properly in stage before deploying to prod next week.
@meli, @chuazhan If you have time, please also review.
I will have to merge this without review - the issue is causing outages in prod.
Pull-Request has been merged by lholecek
JIRA: RHELWF-6331