Merge branch '2144-empty-users' into 'develop'