#14 rollback tx only in interceptor if it is still active
Merge remote-tracking branch 'origin/master'