Partial sync with upstream WCM 0.17.1 (combobox)