Add missing DB rollback functionality
Merge pull request #11767 from danbartram/add_db_rollback

Add missing DB rollback functionality