Merge branch 'status-visibility-count-stats' into 'develop'