Merging @ramonalisa1's combobox change to master