Merge branch 'hotfix/1.0.2a' into develop
Add user search capability
Merge branch 'release/1.0.3'