EMPIREDB-364 Improved rollback handling
6 files changed