Merge branch 'feature/1720-status-view' into 'develop'