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