Backport: Harmonize user select input with the added group select input#1217

zak39 merged 1 commit intostable4.0arawa/workspace:stable4.0from

backport/harmonize-user-select-input/1216/stable4.0arawa/workspace:backport/harmonize-user-select-input/1216/stable4.0Copy head branch name to clipboard