Move/Rename a Published document with an image does not updated correctly the target reference and the image reference

Observed on XWiki version 16.4.3 and 16.10.5
Rename/move a published document does not update the field 'target' for both 'PublicationWorkflow.PublicationWorkflowClass' objects and content images reference are modified to point on the previous document name.

Note that renaming a published document without image or renaming a document with an image but no workflow will work correctly. It seems that both listeners “working together” cause an issue.

To reproduce : 

Workflow config :

Default draft space
Drafts 
Default target space
Published 
Set Drafts to Hidden?
No 
Move strategy
Regardless of the type of document being moved, move its equivalent document(s) 
Allow custom publication comment ?
No 
Skip draft rights update on workflow transition
No  

Steps :

• Create a Draft document and insert an image inside
• Publish Document
• Move/Rename the published document

Results :

• The property 'target' of 'PublicationWorkflow.PublicationWorkflowClass' object is not updated in both draft and published document.
  • 'Go to draft' button create a new document in Draft space, publishing the draft will created a new document. 
• The Image Reference is broken (reference updated with previous document name)