Merge "Make sure loading extra info once" into tm-dev