merged linked-accounts branch