- Backport the dupe uuid and entity log changes