c792a25 Backport MR #463 and MR #494 to fix a couple of bugs

Authored and Committed by adamwill 5 years ago
    Backport MR #463 and MR #494 to fix a couple of bugs
    
    Resolves: #1696270
    Resolves: #1690429
    
        
file modified
+15 -1