The new defusing changes (only live on the beta-branch so far)