initial effective calculation - Q3760
Merge remote-tracking branch 'origin/master'