Feature/986 rollup missing fields

# Warning
# Info
# Issues
Fixes #986.
Fixes #918.