Merge branch 'dev' into chose-points
bug fix
Merge branch 'chose-points' into dev