initial effective calculation - Q3710 & Q3711
Merge remote-tracking branch 'origin/master'