Merge "Deal with non-ASCII characters on resolution info" into tm-dev