Merge "-Fix some typo -Remove one unnecessary memory allocation"