Merge branch 'bugfix/1670-user-count' into 'develop'