Merge branch 'hotfix/widget-direction' into staging