Add more information upon failure
Add missing Modality
Fix a compilation error with clang

Intention is the same
Merge branch 'release'