Match "_" to "-"
Merge branch 'hotfix/1.1.3'