109cc71 Rebase to version 6.00

Authored and Committed by ljavorsk 2 years ago
    Rebase to version 6.00
    
    Patch 22 was upstreamed
    
    Resolves: #2134657
    
        
file modified
+1 -0
file modified
+6 -6
file modified
+1 -1