Merge "Add quotes to force string conversion"