0ccbe47 cherry-pick some fixes

Authored and Committed by kraxel a year ago
    cherry-pick some fixes
    
        
file modified
+14 -0