Merge branch 'feature/pleromafe-usersearch' into 'develop'