resolves: rhbz#1994984
Rebase RHEL patches. resolves: rhbz#1950634 (cherry picked from commit c8d08693ef)
c8d08693ef