Merge "Bugfix for error accumulator stats"