Fix the support for custom labels in control groups
Merge branch 'hotfix/1.0.6'