merged initial points
Merge branch 'update-new' into merge-init