f6c393 Backport two more fixes and refresh patches

Authored and Committed by dcavalca 7 months ago
    Backport two more fixes and refresh patches
    
        
file modified
+8 -1