Merge "Do not use empty UserInfo constructor"