change GlobalKey.User
Merge branch 'rfrost'