Merge branch '1112-user-insert-conflict-id-preservation' into 'develop'