Merge branch 'hotfix/hotfix'
widget hotfix
Merge branch 'hotfix/widget-hotfix' into develop