Merge branch '2301-users-search-discoverability-fix' into 'develop'