6b8a0a5 Backport various OCI fixes from upstream

Authored and Committed by kalev 3 years ago
    Backport various OCI fixes from upstream
    
        
file added
+26
file added
+43
file added
+32
file modified
+8 -1