Preserve string value as it is specified
Merge branch 'string-value'