Merge "Remove redefinition in handle_inter_mode"