resolves: rhbz#1967057 (cherry picked from commit 0ea9cb6a593b561dbead8224d91ea789d4db75ce)
resolves: rhbz#1967057 (cherry picked from commit a696f8929e5a323668ac8e73c68ae5073c01ed87)