Merge branch 'chore/refactor-hide-counts' into 'develop'