Merge branch '2435-list-multiple-users' into 'develop'