Fixed: revert commit abdf1156d4d3d33afff55e168881cd7729c28fe0 for CPComboBox