CLC-4230 - Split User::SearchUsers into two models