Merge "Move load account info inside try block fix exception not catch" into tm-dev