Fix the support for custom labels in control groups
Fix the support for custom labels in control groups

Alxdhere/yiistrap,crisu83/yiistrap,marcovtwout/yiistrap,Alxdhere/yiistrap,marcovtwout/yiistrap,crisu83/yiistrap