Merge "Fix for V3 identity failing test cases."