242411 Update to spec-2.1

Authored and Committed by jchaloup 4 years ago
    Update to spec-2.1
    - related: #1250487