Merge "Retroactively add identity V2 to 5.xml."