Merge branch 'feature/1734-user-deletion' into 'develop'