The solution in the PR used a form to restore the draft. We don't like this approach
During a brainstorm session one other solution came up: store the draft as an embedded content object
Make a test setup with embedded storage of the content document and prove it can be used for the draft.
In previous tests the retrieval of the document was a problem. Make sure it is not.