optimize controller
optimize controller
optimize label controller
separate label controller
Merge branch 'issue-179' into develop