Merge "Fix incorrect validation in SwitchConfig"