This is a feature-branch pull-request from feature/dropdown-combobox to main

This is a feature-branch pull-request from feature/dropdown-combobox to main #3824