Merge "Deal with non-ASCII characters on resolution info"