Estimates are decimal data
Merge branch 'master' into calculation-specs