Merge branch 'hotfix/hotfix'
Widgets fix
Merge branch 'hotfix/hotfix' into develop