Rollback actor on exception
Added TODO
Merge with master
Fixed issue
merged into master