Merge branch 'remove-user-info' into 'develop'