Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"