d4a3ba4 add 2 upstream fixes

Authored and Committed by raveit65 3 years ago
    add 2 upstream fixes
    
        
file modified
+8 -1