0781ec4 Import latest fixes on 2.35 branch

Authored and Committed by nickc 3 years ago
    Import latest fixes on 2.35 branch
    
        
file modified
+11 -5