14 Commits (feature/extend_user)