Merge branch 'confirm-users' into 'develop'