Merge "Fix for V2 identity failing test cases."