Feature/resume transaction

I feel this is merge-ready, any more remarks?