Merge branch 'fix/966-local-user-search' into 'develop'