fixed frozen hash bug with report calculations
Merge branch 'release-4.8' into staging