Merge branch 'feature/widget-direction' into staging