Merge branch '1976-status-view-fixes' into 'develop'