Merge branch 'bugfix/user-search-with-at-sign' into 'develop'