Fixed bug in statistics_calculation. Config updated.
Merge "Fixed bug in statistics_calculation. Config updated."