Evaluation point script rewritten
Merge remote-tracking branch 'origin/version2' into version2
Merge remote-tracking branch 'origin/version2' into version2
Unified code