Restore accessibility of users
Merge branch 'hotfix/0.7.3'