resolves: rhbz#1967057 (cherry picked from commit 0ea9cb6a59)
0ea9cb6a59
resolves: rhbz#1967057 (cherry picked from commit a696f8929e)
a696f8929e