$labels to labels
Merge branch 'hotfix/1.0.4'
Merge tag '1.0.4' into develop

1.0.4