Summary of changes: 0ab3dd0... Backport patch to fix crash cause by TpAccount are out of s (*) d73b77a... Rebase patch (*) (*) This commit already existed in another branch; no separate mail sent