Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev