Fix setting of label for control groups
Merge branch 'master' into stable