Merge "fix sound type issue" into 2.0_beta