Merge "rename encodeString to encodeToString"