Merge "Add more info to dump" into tm-dev