ComboProperty further cleanup, and always have valid current index

Merge request reports

Loading