Please backport cleanup handling to 1.1.x

Issue information

From user: mxh

Related to !475 (merged) !474 (closed)

Contribution record

Fork management

Problem/Motivation

Can we please have a backport to 1.1.x of the following issue: #3503270: Ensure all cleanup is happening even if exceptions get thrown during processing a model

Steps to reproduce

Proposed resolution

Remaining tasks

User interface changes

API changes

Data model changes