424eca1 Add cherry-picks for bugs found in 3.9.0b1

Authored and Committed by pviktori 3 years ago
    Add cherry-picks for bugs found in 3.9.0b1
    
    These should be released with the next beta, but we need to build with them.
    
        
file modified
+18 -1