Fix for Spring Data exception. User Id not found.
Merge remote-tracking branch 'origin/develop' into develop