- Also fixes commit/rollback logic to prevent deletion of wrong files on rollback Closes #17491 Closes #17660