Double toggle fix
Dump reset fix merge