Merge "Run /abandon and /restore in a single database operation"