Merge "Fix unquoted string"