$labels to labels
Merge branch 'hotfix/1.0.4'