Use anonymous user ID for Guest users.
Merge branch '3.0'