3755855 Migrate some upstream patches

Authored and Committed by fujiwara a year ago
    Migrate some upstream patches
    
        
file modified
+450 -0
file modified
+5 -1