initial effective calculation - Q3610, Q3620, Q3630, Q3631
Merge remote-tracking branch 'origin/master'