[MERGE] changes for string