2135046 Auto-sync with upstream branch release/2.28/master

Authored and Committed by fweimer 5 years ago
    Auto-sync with upstream branch release/2.28/master
    
    Upstream commit: 5cbb73004b635e762e20b447c2d93c307cb40f41
    
    - Fix pldd hang (#1361689)
    
        
file modified
+7 -2
file modified
+1 -1