CW-77 fixing duplicate controller instance on WidgetCtrl
CW-77 fixing duplicate controller instance on WidgetCtrl
Merge branch 'feature/cw-77' into develop