Merge branch 'feature/count-statuses-task' into 'develop'