Merge "Remove identity race condition"