issue #21251: merge combobox and comboboxwidget
issue #21251: bugfix