a701594 add a few upstream commits from 1.26 branch

Authored and Committed by raveit65 2 years ago
    add a few upstream commits from 1.26 branch
    
        
file modified
+8 -1