Merge branch 'en/merge-ort-renorm-with-rename-delete-conflict-fix'