Fix/staggered typo and missing reset residual

Merged Melanie Lipp requested to merge fix/staggered-typo-and-missing-resetResidual into master

Merge request reports