4065822 Backport some upstream patches which will be included in rc3

Authored and Committed by besser82 a year ago
    Backport some upstream patches which will be included in rc3
    
        
file modified
+16 -1