54b81ee Backport various fixes from upstream

Authored and Committed by ngompa 3 years ago
    Backport various fixes from upstream
    
        
file modified
+18 -1