1942797 Rebase to 2.5.0

Authored and Committed by tkorbar 2 years ago
    Rebase to 2.5.0
    
    Resolves: rhbz#2137660
    
        
file modified
+1 -0
file modified
+5 -1
file modified
+1 -1