[TIMOB-13030] Fixed some bugs where deferred calculations weren't contributing properly to running sums
Merge pull request #4018 from bryan-m-hughes/timob-13030

[TIMOB-13030] Fixed some bugs where deferred calculations weren't contri...