Merge "Fix the infinite loop issue of the conversion from string to double"