Merge "Random fix for Identity class."