Merge branch 'fix/1019-correct-count-remote-users' into 'develop'