fix duplicate string
fix duplicate string
Merge remote-tracking branch 'stable/develop'