Making searching for users - in process
Merge remote-tracking branch 'origin/develop' into develop