f60389e Backport a couple of MRs to fix blocker issues

Authored and Committed by adamwill a year ago
    Backport a couple of MRs to fix blocker issues
    
        
file added
+247
file added
+277
file modified
+17 -1