Fixes #2405 for restarts
Merges #2447

remaining TODOs (but not the scope of this ticket):

* Keep bereq attributes for bereq
* improved rollback