Pass correct place to discriminant_switch_effect
#69676
+28
−20
Merged