Changes included for hardware selection dialog