Merge "Refactor String resolution."