Merge branch 'hotfix/widget_fixes'
Merge branch 'develop'
Merge branch 'develop'
updated before filter