c1d8847 Rebase to 8.45

Authored and Committed by c72578 2 years ago
    Rebase to 8.45
    
    - Fixes #1972322
    
        
file modified
+2 -0
file modified
+5 -2
file modified
+2 -2