[#85000370] design switch improvements