related: rhbz#1950634 (cherry picked from commit 3f9c4466805902a81ca8398036be00cc1bc54ee6)
related: rhbz#1950634