attached patch was created based on upstream commit 734845b79a Resolves: #1909674
734845b79a
Content corresponds with RHEL dist-git commit 0134352