6a63c64 Rebase to latest upstream

Authored and Committed by rdossant a year ago
    Rebase to latest upstream
    
    - Resolves #1871417
    - Resolves #1869065
    
    Signed-off-by: Rafael dos Santos <rdossant@redhat.com>
    
        
file modified
+6 -3
file modified
+1 -1