Merge "Fix string typo issue"