Ensure dump_storage is called last
https://app.asana.com/0/6477513906633/22000114969385