EDOC-1569: fixing move-update order
Merge branch 'engagepoint/bugfix/EDOC-1569' into engagepoint/develop