e955d5 Backport PR #9027 to fix a bug that broke some test suites (#1994006)

Authored and Committed by Adam Williamson 3 years ago
    Backport PR #9027 to fix a bug that broke some test suites (#1994006)
    
        
file modified
+8 -1