Merge branch 'hotfix/widget_header' into develop