Change the calculation process.
Merge remote-tracking branch 'origin/Release9' into Release9