f106522 Merge back downstream spec

Authored and Committed by frantisekz a year ago
    Merge back downstream spec
    
        
file modified
+10 -2