(#1460) - always cancel changes when db is destroyed