Merge "Hoist getUserName up onto CurrentUser"