[MERGE] Merged trunk-trigger-on_mode_switch.