Merge branch 'fix/search-users-for-admin' into 'develop'