fix lang error and stop bug
Merge branch 'fix-stop' into develop