Fix tags for cases
Merge branch 'hotfix/0.2.31.4'