Merge branch 'delete-account-fix' into 'develop'