Merge "Fix cut/paste typo confusing double/string"